RepoMirrors
/
openssh
mirror of git://anongit.mindrot.org/openssh.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

- otto@cvs.openbsd.org 2005/10/25 06:37:47 

[openbsd-compat/sys-queue.h]
     Some uvm problem is being exposed with the more strict macros.
     Revert until we've found out what's causing the panics.
This commit is contained in:
Damien Miller 2007-10-26 16:44:27 +10:00
parent 0b6a21d468
commit 300f95fccb
2 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -114,6 +114,10 @@
[openbsd-compat/sys-queue.h]
Partly backout. NOLIST, used in LISTs is probably interfering.
requested by deraadt@
- otto@cvs.openbsd.org 2005/10/25 06:37:47
[openbsd-compat/sys-queue.h]
Some uvm problem is being exposed with the more strict macros.
Revert until we've found out what's causing the panics.
- (djm) [regress/sftp-cmds.sh]
Use more restrictive glob to pick up test files from /bin - some platforms
ship broken symlinks there which could spoil the test.
@ -3390,4 +3394,4 @@
OpenServer 6 and add osr5bigcrypt support so when someone migrates
passwords between UnixWare and OpenServer they will still work. OK dtucker@
$Id: ChangeLog,v 1.4789 2007/10/26 06:43:22 djm Exp $
$Id: ChangeLog,v 1.4790 2007/10/26 06:44:27 djm Exp $

13
openbsd-compat/sys-queue.h
View File

@ -1,4 +1,4 @@
/* $OpenBSD: queue.h,v 1.29 2005/10/24 20:25:14 otto Exp $ */
/* $OpenBSD: queue.h,v 1.30 2005/10/25 06:37:47 otto Exp $ */
/* $NetBSD: queue.h,v 1.11 1996/05/16 05:17:14 mycroft Exp $ */
/*
@ -236,7 +236,6 @@ struct { \
curelm = curelm->field.sle_next; \
curelm->field.sle_next = \
curelm->field.sle_next->field.sle_next; \
(elm)->field.sle_next = NULL; \
} \
} while (0)
@ -312,8 +311,6 @@ struct { \
&(elm2)->field.le_next; \
(elm2)->field.le_prev = (elm)->field.le_prev; \
*(elm2)->field.le_prev = (elm2); \
(elm)->field.le_prev = NULL; \
(elm)->field.le_next = NULL; \
} while (0)
/*
@ -468,8 +465,6 @@ struct { \
else \
(head)->tqh_last = (elm)->field.tqe_prev; \
*(elm)->field.tqe_prev = (elm)->field.tqe_next; \
(elm)->field.tqe_prev = NULL; \
(elm)->field.tqe_next = NULL; \
} while (0)
#define TAILQ_REPLACE(head, elm, elm2, field) do { \
@ -480,8 +475,6 @@ struct { \
(head)->tqh_last = &(elm2)->field.tqe_next; \
(elm2)->field.tqe_prev = (elm)->field.tqe_prev; \
*(elm2)->field.tqe_prev = (elm2); \
(elm)->field.tqe_prev = NULL; \
(elm)->field.tqe_next = NULL; \
} while (0)
/*
@ -582,8 +575,6 @@ struct { \
else \
(elm)->field.cqe_prev->field.cqe_next = \
(elm)->field.cqe_next; \
(elm)->field.cqe_next = NULL; \
(elm)->field.cqe_prev = NULL; \
} while (0)
#define CIRCLEQ_REPLACE(head, elm, elm2, field) do { \
@ -597,8 +588,6 @@ struct { \
(head).cqh_first = (elm2); \
else \
(elm2)->field.cqe_prev->field.cqe_next = (elm2); \
(elm)->field.cqe_next = NULL; \
(elm)->field.cqe_prev = NULL; \
} while (0)
#endif /* !_FAKE_QUEUE_H_ */