Merge to Fedora kernel-2.6.18-1.2255_FC5-vs2.0.2.2-rc9 patched with stable patch...

[linux-2.6.git] / kernel / softirq.c

diff --git a/kernel/softirq.c b/kernel/softirq.c
index 87e835b..3789ca9 100644 (file)
--- a/kernel/softirq.c
+++ b/kernel/softirq.c
@@ -17,7 +17,6 @@
 #include <linux/kthread.h>
 #include <linux/rcupdate.h>
 #include <linux/smp.h>
-#include <linux/vs_context.h>
 
 #include <asm/irq.h>
 /*
@@ -206,7 +205,6 @@ EXPORT_SYMBOL(local_bh_enable_ip);
 
 asmlinkage void __do_softirq(void)
 {
-       struct vx_info_save vxis;
        struct softirq_action *h;
        __u32 pending;
        int max_restart = MAX_SOFTIRQ_RESTART;
@@ -216,7 +214,6 @@ asmlinkage void __do_softirq(void)
        account_system_vtime(current);
 
        __local_bh_disable((unsigned long)__builtin_return_address(0));
-       __enter_vx_admin(&vxis);
        trace_softirq_enter();
 
        cpu = smp_processor_id();
@@ -248,7 +245,6 @@ restart:
 
        trace_softirq_exit();
 
-       __leave_vx_admin(&vxis);
        account_system_vtime(current);
        _local_bh_enable();
 }