diff options
author | Damien Miller <djm@mindrot.org> | 2007-10-26 16:44:27 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2007-10-26 16:44:27 +1000 |
commit | 300f95fccb6822d50deff0cb2e134c221f823e5a (patch) | |
tree | 8b028427493c58f9af1d31134af7494d514c2a8f | |
parent | 0b6a21d468e19702f3a9febdace803225ce2fbf7 (diff) |
- 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.
-rw-r--r-- | ChangeLog | 6 | ||||
-rw-r--r-- | openbsd-compat/sys-queue.h | 13 |
2 files changed, 6 insertions, 13 deletions
@@ -114,6 +114,10 @@ | |||
114 | [openbsd-compat/sys-queue.h] | 114 | [openbsd-compat/sys-queue.h] |
115 | Partly backout. NOLIST, used in LISTs is probably interfering. | 115 | Partly backout. NOLIST, used in LISTs is probably interfering. |
116 | requested by deraadt@ | 116 | requested by deraadt@ |
117 | - otto@cvs.openbsd.org 2005/10/25 06:37:47 | ||
118 | [openbsd-compat/sys-queue.h] | ||
119 | Some uvm problem is being exposed with the more strict macros. | ||
120 | Revert until we've found out what's causing the panics. | ||
117 | - (djm) [regress/sftp-cmds.sh] | 121 | - (djm) [regress/sftp-cmds.sh] |
118 | Use more restrictive glob to pick up test files from /bin - some platforms | 122 | Use more restrictive glob to pick up test files from /bin - some platforms |
119 | ship broken symlinks there which could spoil the test. | 123 | ship broken symlinks there which could spoil the test. |
@@ -3390,4 +3394,4 @@ | |||
3390 | OpenServer 6 and add osr5bigcrypt support so when someone migrates | 3394 | OpenServer 6 and add osr5bigcrypt support so when someone migrates |
3391 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ | 3395 | passwords between UnixWare and OpenServer they will still work. OK dtucker@ |
3392 | 3396 | ||
3393 | $Id: ChangeLog,v 1.4789 2007/10/26 06:43:22 djm Exp $ | 3397 | $Id: ChangeLog,v 1.4790 2007/10/26 06:44:27 djm Exp $ |
diff --git a/openbsd-compat/sys-queue.h b/openbsd-compat/sys-queue.h index e5c5e2f9f..db747befa 100644 --- a/openbsd-compat/sys-queue.h +++ b/openbsd-compat/sys-queue.h | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: queue.h,v 1.29 2005/10/24 20:25:14 otto Exp $ */ | 1 | /* $OpenBSD: queue.h,v 1.30 2005/10/25 06:37:47 otto Exp $ */ |
2 | /* $NetBSD: queue.h,v 1.11 1996/05/16 05:17:14 mycroft Exp $ */ | 2 | /* $NetBSD: queue.h,v 1.11 1996/05/16 05:17:14 mycroft Exp $ */ |
3 | 3 | ||
4 | /* | 4 | /* |
@@ -236,7 +236,6 @@ struct { \ | |||
236 | curelm = curelm->field.sle_next; \ | 236 | curelm = curelm->field.sle_next; \ |
237 | curelm->field.sle_next = \ | 237 | curelm->field.sle_next = \ |
238 | curelm->field.sle_next->field.sle_next; \ | 238 | curelm->field.sle_next->field.sle_next; \ |
239 | (elm)->field.sle_next = NULL; \ | ||
240 | } \ | 239 | } \ |
241 | } while (0) | 240 | } while (0) |
242 | 241 | ||
@@ -312,8 +311,6 @@ struct { \ | |||
312 | &(elm2)->field.le_next; \ | 311 | &(elm2)->field.le_next; \ |
313 | (elm2)->field.le_prev = (elm)->field.le_prev; \ | 312 | (elm2)->field.le_prev = (elm)->field.le_prev; \ |
314 | *(elm2)->field.le_prev = (elm2); \ | 313 | *(elm2)->field.le_prev = (elm2); \ |
315 | (elm)->field.le_prev = NULL; \ | ||
316 | (elm)->field.le_next = NULL; \ | ||
317 | } while (0) | 314 | } while (0) |
318 | 315 | ||
319 | /* | 316 | /* |
@@ -468,8 +465,6 @@ struct { \ | |||
468 | else \ | 465 | else \ |
469 | (head)->tqh_last = (elm)->field.tqe_prev; \ | 466 | (head)->tqh_last = (elm)->field.tqe_prev; \ |
470 | *(elm)->field.tqe_prev = (elm)->field.tqe_next; \ | 467 | *(elm)->field.tqe_prev = (elm)->field.tqe_next; \ |
471 | (elm)->field.tqe_prev = NULL; \ | ||
472 | (elm)->field.tqe_next = NULL; \ | ||
473 | } while (0) | 468 | } while (0) |
474 | 469 | ||
475 | #define TAILQ_REPLACE(head, elm, elm2, field) do { \ | 470 | #define TAILQ_REPLACE(head, elm, elm2, field) do { \ |
@@ -480,8 +475,6 @@ struct { \ | |||
480 | (head)->tqh_last = &(elm2)->field.tqe_next; \ | 475 | (head)->tqh_last = &(elm2)->field.tqe_next; \ |
481 | (elm2)->field.tqe_prev = (elm)->field.tqe_prev; \ | 476 | (elm2)->field.tqe_prev = (elm)->field.tqe_prev; \ |
482 | *(elm2)->field.tqe_prev = (elm2); \ | 477 | *(elm2)->field.tqe_prev = (elm2); \ |
483 | (elm)->field.tqe_prev = NULL; \ | ||
484 | (elm)->field.tqe_next = NULL; \ | ||
485 | } while (0) | 478 | } while (0) |
486 | 479 | ||
487 | /* | 480 | /* |
@@ -582,8 +575,6 @@ struct { \ | |||
582 | else \ | 575 | else \ |
583 | (elm)->field.cqe_prev->field.cqe_next = \ | 576 | (elm)->field.cqe_prev->field.cqe_next = \ |
584 | (elm)->field.cqe_next; \ | 577 | (elm)->field.cqe_next; \ |
585 | (elm)->field.cqe_next = NULL; \ | ||
586 | (elm)->field.cqe_prev = NULL; \ | ||
587 | } while (0) | 578 | } while (0) |
588 | 579 | ||
589 | #define CIRCLEQ_REPLACE(head, elm, elm2, field) do { \ | 580 | #define CIRCLEQ_REPLACE(head, elm, elm2, field) do { \ |
@@ -597,8 +588,6 @@ struct { \ | |||
597 | (head).cqh_first = (elm2); \ | 588 | (head).cqh_first = (elm2); \ |
598 | else \ | 589 | else \ |
599 | (elm2)->field.cqe_prev->field.cqe_next = (elm2); \ | 590 | (elm2)->field.cqe_prev->field.cqe_next = (elm2); \ |
600 | (elm)->field.cqe_next = NULL; \ | ||
601 | (elm)->field.cqe_prev = NULL; \ | ||
602 | } while (0) | 591 | } while (0) |
603 | 592 | ||
604 | #endif /* !_FAKE_QUEUE_H_ */ | 593 | #endif /* !_FAKE_QUEUE_H_ */ |