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

===================================================================
RCS file: /ftp/cvs/cvsroot/src/sys/rump/include/machine/intr.h,v
rcsdiff: /ftp/cvs/cvsroot/src/sys/rump/include/machine/intr.h,v: warning: Unknown phrases like `commitid ...;' are present.
retrieving revision 1.2.6.4
retrieving revision 1.3
diff -u -p -r1.2.6.4 -r1.3
--- src/sys/rump/include/machine/intr.h	2008/03/23 02:05:09	1.2.6.4
+++ src/sys/rump/include/machine/intr.h	2007/09/11 16:31:01	1.3
@@ -1,4 +1,4 @@
-/*	intr.h,v 1.2.6.3 2008/01/09 01:57:58 matt Exp	*/
+/*	$NetBSD: intr.h,v 1.3 2007/09/11 16:31:01 briggs Exp $	*/
 
 /*
  * Copyright (c) 2007 Antti Kantee.  All Rights Reserved.
@@ -30,26 +30,16 @@
 #ifndef _SYS_RUMP_INTR_H_
 #define _SYS_RUMP_INTR_H_
 
-typedef uint8_t ipl_t;
-typedef struct {
-        ipl_t _ipl;
-} ipl_cookie_t;
-
-int  rump_splfoo(void);
-void rump_splx(int);
-
 #define spllower(x) ((void)0)
 #define splraise(x) 0
-#define splsoftnet() rump_splfoo()
-#define splhigh() rump_splfoo()
-#define splsched() rump_splfoo()
-#define splvm() rump_splfoo()
-#define splx(x) rump_splx(x)
-#define spl0() ((void)0)
+#define splsoftnet() 0
+#define splclock() 0
+#define splbio() 0
+#define splvm() 0
+#define splx(x) ((void)x)
 
 #define IPL_NONE 0
-#define	IPL_SOFTBIO 0
-#define IPL_SCHED 0
+#define IPL_BIO 0
 #define IPL_VM 0
 
 #endif /* _SYS_RUMP_INTR_H_ */