Commit-ID: 1a9a8aefa8f0530c97f4606ab7a2fc01fe31e9c1
Gitweb: http://git.kernel.org/tip/1a9a8aefa8f0530c97f4606ab7a2fc01fe31e9c1
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:20 +0100
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@xxxxxxxxx>
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
---
kernel/printk.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/kernel/printk.c b/kernel/printk.c
index ba5ee04..dfd8f73 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;
}
--
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
|