Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/kern Fix KASSERT to avoid assumptions about ipl order.



details:   https://anonhg.NetBSD.org/src/rev/974b02c7c980
branches:  trunk
changeset: 788880:974b02c7c980
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sat Jul 27 11:19:09 2013 +0000

description:
Fix KASSERT to avoid assumptions about ipl order.

XXX Temporary measure?

diffstat:

 sys/kern/subr_cprng.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r 926d4da9f204 -r 974b02c7c980 sys/kern/subr_cprng.c
--- a/sys/kern/subr_cprng.c     Sat Jul 27 11:13:57 2013 +0000
+++ b/sys/kern/subr_cprng.c     Sat Jul 27 11:19:09 2013 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: subr_cprng.c,v 1.21 2013/07/01 15:22:00 riastradh Exp $ */
+/*     $NetBSD: subr_cprng.c,v 1.22 2013/07/27 11:19:09 skrll Exp $ */
 
 /*-
  * Copyright (c) 2011-2013 The NetBSD Foundation, Inc.
@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: subr_cprng.c,v 1.21 2013/07/01 15:22:00 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: subr_cprng.c,v 1.22 2013/07/27 11:19:09 skrll Exp $");
 
 #include <sys/param.h>
 #include <sys/types.h>
@@ -115,7 +115,7 @@
         * rndsink_request takes a spin lock at IPL_VM, so we can be no
         * higher than that.
         */
-       KASSERT(ipl <= IPL_VM);
+       KASSERT(ipl != IPL_SCHED && ipl != IPL_HIGH);
 
        /* Initialize the easy fields.  */
        (void)strlcpy(cprng->cs_name, name, sizeof(cprng->cs_name));



Home | Main Index | Thread Index | Old Index