From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 7 Dec 2007 18:02:47 +0000 (+0100)
Subject: lockdep: make cli/sti annotation warnings clearer
X-Git-Tag: v2.6.24-rc5~50^2~1
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=5f9fa8a62d6a98f5cb2ee2e00b85bfe95e45888d;p=linux-2.6-omap-h63xx.git

lockdep: make cli/sti annotation warnings clearer

make cli/sti annotation warnings easier to interpret.

Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
---

diff --git a/kernel/lockdep.c b/kernel/lockdep.c
index 0f389621bb6..723bd9f9255 100644
--- a/kernel/lockdep.c
+++ b/kernel/lockdep.c
@@ -2654,10 +2654,15 @@ static void check_flags(unsigned long flags)
 	if (!debug_locks)
 		return;
 
-	if (irqs_disabled_flags(flags))
-		DEBUG_LOCKS_WARN_ON(current->hardirqs_enabled);
-	else
-		DEBUG_LOCKS_WARN_ON(!current->hardirqs_enabled);
+	if (irqs_disabled_flags(flags)) {
+		if (DEBUG_LOCKS_WARN_ON(current->hardirqs_enabled)) {
+			printk("possible reason: unannotated irqs-off.\n");
+		}
+	} else {
+		if (DEBUG_LOCKS_WARN_ON(!current->hardirqs_enabled)) {
+			printk("possible reason: unannotated irqs-on.\n");
+		}
+	}
 
 	/*
 	 * We dont accurately track softirq state in e.g.