From 6d7271e42b663e19f8a6914e93a1a2e0ad01ec3a Mon Sep 17 00:00:00 2001
From: Frederic Weisbecker <fweisbec@gmail.com>
Date: Sun, 19 Apr 2009 23:38:12 +0200
Subject: [PATCH] --- yaml --- r: 146036 b: refs/heads/master c:
 e057a5e5647a1c9d0d0054fbd298bfa04b3d1cb4 h: refs/heads/master v: v3

---
 [refs]                           | 2 +-
 trunk/kernel/trace/ring_buffer.c | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 7147981ce28f..7f9f53aa29ef 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8e668b5b3455207e4540fc7ccab9ecf70142f288
+refs/heads/master: e057a5e5647a1c9d0d0054fbd298bfa04b3d1cb4
diff --git a/trunk/kernel/trace/ring_buffer.c b/trunk/kernel/trace/ring_buffer.c
index b421b0ea9112..bffde630c4e2 100644
--- a/trunk/kernel/trace/ring_buffer.c
+++ b/trunk/kernel/trace/ring_buffer.c
@@ -1495,6 +1495,13 @@ static int trace_recursive_lock(void)
 	if (unlikely(current->trace_recursion & (1 << level))) {
 		/* Disable all tracing before we do anything else */
 		tracing_off_permanent();
+
+		printk_once(KERN_WARNING "Tracing recursion: "
+			    "HC[%lu]:SC[%lu]:NMI[%lu]\n",
+			    hardirq_count() >> HARDIRQ_SHIFT,
+			    softirq_count() >> SOFTIRQ_SHIFT,
+			    in_nmi());
+
 		WARN_ON_ONCE(1);
 		return -1;
 	}