aboutsummaryrefslogtreecommitdiff
path: root/kernel/printk.c
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2011-06-07 11:17:30 +0200
committerIngo Molnar <mingo@elte.hu>2011-11-14 13:35:20 +0100
commit1a9a8aefa8f0530c97f4606ab7a2fc01fe31e9c1 (patch)
tree41fb56adf3fd6f460e69450de5d66209ba62116d /kernel/printk.c
parent47ff5c95db598184122aa634fa3452c0eecea877 (diff)
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>
Diffstat (limited to 'kernel/printk.c')
-rw-r--r--kernel/printk.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/printk.c b/kernel/printk.c
index ba5ee043582..dfd8f73dcb7 100644
--- 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;
}