X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel%2Fprintk.c;h=ddebdcc585b9c22e0eb09d69a9399236210eb18d;hb=5cd4d056da050eb96d88540ecfd51245a4e1cdf7;hp=913dca305e7a22a7a691f33c17d1fa1247da4506;hpb=b1644648ae5a87454d06f1dd96783b0ec4d292df;p=linux-2.6.git

diff --git a/kernel/printk.c b/kernel/printk.c
index 913dca305..ddebdcc58 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -33,8 +33,8 @@
 #include <linux/security.h>
 #include <linux/bootmem.h>
 #include <linux/syscalls.h>
-#include <linux/vs_context.h>
-#include <linux/vserver/cvirt.h>
+#include <linux/vs_base.h>
+#include <linux/vs_cvirt.h>
 
 #include <asm/uaccess.h>
 
@@ -542,10 +542,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 +652,6 @@ asmlinkage int vprintk(const char *fmt, va_list args)
 		local_irq_restore(flags);
 	}
 
-	__leave_vx_admin(&vxis);
 	preempt_enable();
 	return printed_len;
 }