summaryrefslogtreecommitdiff
path: root/kernel/printk.c
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2011-06-07 09:17:30 (GMT)
committerIngo Molnar <mingo@elte.hu>2011-11-14 12:35:18 (GMT)
commit47ff5c95db598184122aa634fa3452c0eecea877 (patch)
tree93ecf3431a4ebdf47a83a20f73b8964ab1c96f3b /kernel/printk.c
parent94d24fc47219219b5aa23b45956cc37ee5aa5b01 (diff)
downloadlinux-47ff5c95db598184122aa634fa3452c0eecea877.tar.xz
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>
Diffstat (limited to 'kernel/printk.c')
-rw-r--r--kernel/printk.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/kernel/printk.c b/kernel/printk.c
index 6d08794..ba5ee04 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);