Module Name: src
Committed By: martin
Date: Sun Jan 19 07:01:55 UTC 2014
Modified Files:
src/sys/rump/include/machine: intr.h
Log Message:
Make IPL_ values different.
This makes ni real difference for rump, but avoods
KASSERTs in common code when we try to assert
"ipl not higher as...".
Suggested by riastradh, OK: pooka.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 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.19 src/sys/rump/include/machine/intr.h:1.20
--- src/sys/rump/include/machine/intr.h:1.19 Tue Jan 8 08:55:28 2013
+++ src/sys/rump/include/machine/intr.h Sun Jan 19 07:01:55 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: intr.h,v 1.19 2013/01/08 08:55:28 skrll Exp $ */
+/* $NetBSD: intr.h,v 1.20 2014/01/19 07:01:55 martin Exp $ */
/*
* Copyright (c) 2009, 2010 Antti Kantee. All Rights Reserved.
@@ -56,13 +56,18 @@ makeiplcookie(ipl_t ipl)
#define splx(x) ((void)x)
#define spl0() ((void)0)
+/*
+ * IPL_* does not mean anything to a run-to-completition rump kernel,
+ * but we sometimes assert a "not higher than" condition, so we assign
+ * different values (following spl(9)).
+ */
#define IPL_NONE 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
+#define IPL_SOFTBIO 2
+#define IPL_SOFTNET 3
+#define IPL_SOFTSERIAL 4
+#define IPL_VM 5
+#define IPL_SCHED 6
+#define IPL_HIGH 7
#endif /* _SYS_RUMP_INTR_H_ */
