Revert to Fedora kernel-2.6.17-1.2187_FC5 patched with vs2.0.2.1; there are too many...

[linux-2.6.git] / include / linux / vs_base.h

diff --git a/include/linux/vs_base.h b/include/linux/vs_base.h
index 0022fe4..b732600 100644 (file)
--- 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)) ||