aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2011-06-07 05:17:30 -0400
committerIngo Molnar <mingo@elte.hu>2011-11-14 07:35:18 -0500
commit47ff5c95db598184122aa634fa3452c0eecea877 (patch)
tree93ecf3431a4ebdf47a83a20f73b8964ab1c96f3b
parent94d24fc47219219b5aa23b45956cc37ee5aa5b01 (diff)
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>
-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)
841 boot_delay_msec(); 841 boot_delay_msec();
842 printk_delay(); 842 printk_delay();
843 843
844 preempt_disable();
845 /* This stops the holder of console_sem just where we want him */ 844 /* This stops the holder of console_sem just where we want him */
846 raw_local_irq_save(flags); 845 raw_local_irq_save(flags);
847 this_cpu = smp_processor_id(); 846 this_cpu = smp_processor_id();
@@ -965,7 +964,6 @@ asmlinkage int vprintk(const char *fmt, va_list args)
965out_restore_irqs: 964out_restore_irqs:
966 raw_local_irq_restore(flags); 965 raw_local_irq_restore(flags);
967 966
968 preempt_enable();
969 return printed_len; 967 return printed_len;
970} 968}
971EXPORT_SYMBOL(printk); 969EXPORT_SYMBOL(printk);