Commit-ID: 47ff5c95db598184122aa634fa3452c0eecea877 Gitweb: http://git.kernel.org/tip/47ff5c95db598184122aa634fa3452c0eecea877 Author: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx> AuthorDate: Tue, 7 Jun 2011 11:17:30 +0200 Committer: Ingo Molnar <mingo@xxxxxxx> CommitDate: Mon, 14 Nov 2011 13:35:18 +0100 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@xxxxxxxxx> Signed-off-by: Ingo Molnar <mingo@xxxxxxx> --- kernel/printk.c | 2 -- 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); -- To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html