summaryrefslogtreecommitdiffstats
path: root/sys/kern
diff options
context:
space:
mode:
authordillon <dillon@FreeBSD.org>1998-12-14 08:34:55 +0000
committerdillon <dillon@FreeBSD.org>1998-12-14 08:34:55 +0000
commit5b976b6d8d996bf25028267a42ebd0f20149113c (patch)
tree2d19c63a459b64a38c8e388b378c3d622afa3e46 /sys/kern
parent5b20a73d8ea8ff4451e989a348a672c6abc0c00e (diff)
downloadFreeBSD-src-5b976b6d8d996bf25028267a42ebd0f20149113c.zip
FreeBSD-src-5b976b6d8d996bf25028267a42ebd0f20149113c.tar.gz
Fixed problems with kernel config file overrides of sysv semaphore
parameters. Prior to this fix a kernel config override would effect only some of the kernel files, resulting in panics. PR: kern/9068
Diffstat (limited to 'sys/kern')
-rw-r--r--sys/kern/subr_param.c4
-rw-r--r--sys/kern/sysv_sem.c4
2 files changed, 5 insertions, 3 deletions
diff --git a/sys/kern/subr_param.c b/sys/kern/subr_param.c
index 6736b96..ef98c59 100644
--- a/sys/kern/subr_param.c
+++ b/sys/kern/subr_param.c
@@ -36,9 +36,11 @@
* SUCH DAMAGE.
*
* @(#)param.c 8.3 (Berkeley) 8/20/94
- * $Id: param.c,v 1.30 1998/07/11 13:06:38 bde Exp $
+ * $Id: param.c,v 1.31 1998/11/05 14:28:17 dg Exp $
*/
+#include <stddef.h>
+
#include "opt_sysvipc.h"
#include "opt_param.h"
diff --git a/sys/kern/sysv_sem.c b/sys/kern/sysv_sem.c
index d35bbca..fb04c42 100644
--- a/sys/kern/sysv_sem.c
+++ b/sys/kern/sysv_sem.c
@@ -1,4 +1,4 @@
-/* $Id: sysv_sem.c,v 1.20 1997/11/06 19:29:24 phk Exp $ */
+/* $Id: sysv_sem.c,v 1.21 1998/03/30 09:50:41 phk Exp $ */
/*
* Implementation of SVID semaphores
@@ -276,7 +276,7 @@ semundo_adjust(p, supptr, semid, semnum, adjval)
/* Didn't find the right entry - create it */
if (adjval == 0)
return(0);
- if (suptr->un_cnt != SEMUME) {
+ if (suptr->un_cnt != seminfo.semume) {
sunptr = &suptr->un_ent[suptr->un_cnt];
suptr->un_cnt++;
sunptr->un_adjval = adjval;
OpenPOWER on IntegriCloud