summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
Diffstat (limited to 'kernel')
-rw-r--r--kernel/printk.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/printk.c b/kernel/printk.c
index 6d087944e72a..ba5ee0435821 100644
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -841,7 +841,6 @@ asmlinkage int vprintk(const char *fmt, va_list args)
boot_delay_msec();
printk_delay();
- preempt_disable();
/* This stops the holder of console_sem just where we want him */
raw_local_irq_save(flags);
this_cpu = smp_processor_id();
@@ -965,7 +964,6 @@ asmlinkage int vprintk(const char *fmt, va_list args)
out_restore_irqs:
raw_local_irq_restore(flags);
- preempt_enable();
return printed_len;
}
EXPORT_SYMBOL(printk);