diff options
| author | Peter Zijlstra <a.p.zijlstra@chello.nl> | 2011-06-07 11:17:30 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-11-14 13:35:18 +0100 |
| commit | 47ff5c95db598184122aa634fa3452c0eecea877 (patch) | |
| tree | 93ecf3431a4ebdf47a83a20f73b8964ab1c96f3b /kernel/printk.c | |
| parent | printk, lockdep: Disable lock debugging on zap_locks() (diff) | |
| download | linux-47ff5c95db598184122aa634fa3452c0eecea877.tar.xz linux-47ff5c95db598184122aa634fa3452c0eecea877.zip | |
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.c | 2 |
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); |