printk, lockdep: Switch to tracked irq ops

Switch to local_irq_ ops so that the irq state is properly tracked
(raw_local_irq_* isn't tracked by lockdep, causing confusion).

Possible now that commit dd4e5d3ac4a ("lockdep: Fix
trace_[soft,hard]irqs_[on,off]() recursion") cured the reason we
needed the raw_ ops.

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 ba5ee04358219f3191beeb9b495fe186ad6133e7..dfd8f73dcb7656fbe6e4daf6c2d341b439056ed3 100644 (file)
--- a/kernel/printk.c
+++ b/kernel/printk.c
@@ -842,7 +842,7 @@ asmlinkage int vprintk(const char *fmt, va_list args)
        printk_delay();
 
        /* This stops the holder of console_sem just where we want him */
-       raw_local_irq_save(flags);
+       local_irq_save(flags);
        this_cpu = smp_processor_id();
 
        /*
@@ -962,7 +962,7 @@ asmlinkage int vprintk(const char *fmt, va_list args)
 
        lockdep_on();
 out_restore_irqs:
-       raw_local_irq_restore(flags);
+       local_irq_restore(flags);
 
        return printed_len;
 }