printk, lockdep: Remove superfluous preempt_disable()

The raw_lock_irq_{save,restore}() already implies a
non-preemptibility.

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --git a/kernel/printk.c b/kernel/printk.c
index 6d08794..ba5ee04 100644 (file)
--- 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);