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

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

diff --git a/kernel/printk.c b/kernel/printk.c
index 913dca3..7d006af 100644 (file)
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -33,7 +33,6 @@
 #include <linux/security.h>
 #include <linux/bootmem.h>
 #include <linux/syscalls.h>
-#include <linux/vs_context.h>
 #include <linux/vserver/cvirt.h>
 
 #include <asm/uaccess.h>
@@ -542,10 +541,8 @@ asmlinkage int vprintk(const char *fmt, va_list args)
        char *p;
        static char printk_buf[1024];
        static int log_level_unknown = 1;
-       struct vx_info_save vxis;
 
        preempt_disable();
-       __enter_vx_admin(&vxis);
        if (unlikely(oops_in_progress) && printk_cpu == smp_processor_id())
                /* If a crash is occurring during printk() on this CPU,
                 * make sure we can't deadlock */
@@ -654,7 +651,6 @@ asmlinkage int vprintk(const char *fmt, va_list args)
                local_irq_restore(flags);
        }
 
-       __leave_vx_admin(&vxis);
        preempt_enable();
        return printed_len;
 }