diff --git a/[refs] b/[refs] index 808bf3956f51..089ea4b02fcf 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 94d24fc47219219b5aa23b45956cc37ee5aa5b01 +refs/heads/master: 47ff5c95db598184122aa634fa3452c0eecea877 diff --git a/trunk/kernel/printk.c b/trunk/kernel/printk.c index 6d087944e72a..ba5ee0435821 100644 --- a/trunk/kernel/printk.c +++ b/trunk/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);