X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=include%2Flinux%2Fvs_base.h;h=b732600c4cc37be1d11dc03710007fdd02086b6b;hb=9464c7cf61b9433057924c36e6e02f303a00e768;hp=0022fe45f39c39038be83479e7e5208b0565fb28;hpb=41689045f6a3cbe0550e1d34e9cc20d2e8c432ba;p=linux-2.6.git

diff --git a/include/linux/vs_base.h b/include/linux/vs_base.h
index 0022fe45f..b732600c4 100644
--- a/include/linux/vs_base.h
+++ b/include/linux/vs_base.h
@@ -3,19 +3,11 @@
 
 #include "vserver/context.h"
 
-#define VX_IRQ        0x4000
-#define VX_IRQ_MASK   0xF000
-#if 1
-#include <linux/hardirq.h>
-#endif
-
 #define vx_task_xid(t)	((t)->xid)
 
 #define vx_current_xid() vx_task_xid(current)
 
-#define current_vx_info() (current->vx_info)
-
-#define vx_check(c,m)	__vx_check(vx_current_xid(),c,m|VX_IRQ)
+#define vx_check(c,m)	__vx_check(vx_current_xid(),c,m)
 
 #define vx_weak_check(c,m)	((m) ? vx_check(c,m) : 1)
 
@@ -40,10 +32,6 @@ static inline int __vx_check(xid_t cid, xid_t id, unsigned int mode)
 			(id > 1) && (id < MIN_D_CONTEXT))
 			return 1;
 	}
-#if 1
-	if ((mode & VX_IRQ) && (unlikely(in_interrupt())))
-		return 1;
-#endif
 
 	return (((mode & VX_ADMIN) && (cid == 0)) ||
 		((mode & VX_WATCH) && (cid == 1)) ||