Module Name:    src
Committed By:   pooka
Date:           Mon Aug 30 18:29:52 UTC 2010

Modified Files:
        src/sys/rump/include/machine: intr.h

Log Message:
Make IPLs not equal IPL_NONE to avoid some KASSERTs.


To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/sys/rump/include/machine/intr.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/rump/include/machine/intr.h
diff -u src/sys/rump/include/machine/intr.h:1.16 src/sys/rump/include/machine/intr.h:1.17
--- src/sys/rump/include/machine/intr.h:1.16	Fri Feb  6 20:01:41 2009
+++ src/sys/rump/include/machine/intr.h	Mon Aug 30 18:29:52 2010
@@ -1,4 +1,4 @@
-/*	$NetBSD: intr.h,v 1.16 2009/02/06 20:01:41 pooka Exp $	*/
+/*	$NetBSD: intr.h,v 1.17 2010/08/30 18:29:52 pooka Exp $	*/
 
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
@@ -37,10 +37,8 @@
         ipl_t _ipl;
 } ipl_cookie_t;
 
-static inline ipl_cookie_t makeiplcookie(ipl_t);
-
-static inline
-ipl_cookie_t makeiplcookie(ipl_t ipl)
+static inline ipl_cookie_t
+makeiplcookie(ipl_t ipl)
 {
 	ipl_cookie_t c;
 	c._ipl = ipl;
@@ -60,12 +58,12 @@
 #define spl0() ((void)0)
 
 #define IPL_NONE 0
-#define	IPL_SOFTBIO 0
-#define	IPL_SOFTCLOCK 0
-#define IPL_SOFTSERIAL 0
-#define	IPL_SOFTNET 0
-#define IPL_SCHED 0
-#define IPL_VM 0
-#define IPL_HIGH 0
+#define	IPL_SOFTBIO 1
+#define	IPL_SOFTCLOCK 1
+#define IPL_SOFTSERIAL 1
+#define	IPL_SOFTNET 1
+#define IPL_SCHED 2
+#define IPL_VM 2
+#define IPL_HIGH 2
 
 #endif /* _SYS_RUMP_INTR_H_ */

Reply via email to