---

yaml --- r: 146069 b: refs/heads/master c: 7d7d2b8 h: refs/heads/master i: 146067: 869ec0c v: v3
git-mirror · Apr 29, 2009 · 00f26a0 · 00f26a0
1 parent e09c5cb
commit 00f26a0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f2957f1f196b0217644a17c1379855a118a37d72
+refs/heads/master: 7d7d2b803159d4edeb051b0e5efbc1a8d9ef1c67
diff --git a/trunk/kernel/trace/ring_buffer.c b/trunk/kernel/trace/ring_buffer.c
@@ -1491,7 +1491,7 @@ static int trace_recursive_lock(void)
 	/* Disable all tracing before we do anything else */
 	tracing_off_permanent();
 
-	printk_once(KERN_WARNING "Tracing recursion: depth[%d]:"
+	printk_once(KERN_WARNING "Tracing recursion: depth[%ld]:"
 		    "HC[%lu]:SC[%lu]:NMI[%lu]\n",
 		    current->trace_recursion,
 		    hardirq_count() >> HARDIRQ_SHIFT,