X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=kernel%2Fprintk.c;fp=kernel%2Fprintk.c;h=7d006afa9e135ca08d76dd9d1a4737ea3b57f9d6;hb=e0ff8aa1acd079b70e796571917ae0449b7c465b;hp=913dca305e7a22a7a691f33c17d1fa1247da4506;hpb=bef9ea3086d47cf98cfd0ea389953a0af0b60114;p=linux-2.6.git

diff --git a/kernel/printk.c b/kernel/printk.c
index 913dca305..7d006afa9 100644
--- 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;
 }