Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 2c522836627c6e78660f8bd52cdb4cdcb75e3e3c

Authored by Dave Jones
Committed by Ingo Molnar
1 parent 199e371f59
Exists in smarc-l5.0.0_1.0.0-ga and in 5 other branches imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga

lockdep: Consolidate bug messages into a single print_lockdep_off() function 

Also add some missing printk levels.

Signed-off-by: Dave Jones <davej@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/20130425174002.GA26769@redhat.com
[ Tweaked the messages a bit. ]
Signed-off-by: Ingo Molnar <mingo@kernel.org>

Showing 1 changed file with 13 additions and 15 deletions Side-by-side Diff

... ... @@ -380,6 +380,13 @@
380 380 unsigned long nr_stack_trace_entries;
381 381 static unsigned long stack_trace[MAX_STACK_TRACE_ENTRIES];
382 382  
  383 +static void print_lockdep_off(const char *bug_msg)
  384 +{
  385 + printk(KERN_DEBUG "%s\n", bug_msg);
  386 + printk(KERN_DEBUG "turning off the locking correctness validator.\n");
  387 + printk(KERN_DEBUG "Please attach the output of /proc/lock_stat to the bug report\n");
  388 +}
  389 +
383 390 static int save_trace(struct stack_trace *trace)
384 391 {
385 392 trace->nr_entries = 0;
... ... @@ -409,9 +416,7 @@
409 416 if (!debug_locks_off_graph_unlock())
410 417 return 0;
411 418  
412   - printk("BUG: MAX_STACK_TRACE_ENTRIES too low!\n");
413   - printk("turning off the locking correctness validator.\n");
414   - printk("Attach output of /proc/lock_stat to bug report\n");
  419 + print_lockdep_off("BUG: MAX_STACK_TRACE_ENTRIES too low!");
415 420 dump_stack();
416 421  
417 422 return 0;
... ... @@ -764,9 +769,7 @@
764 769 }
765 770 raw_local_irq_restore(flags);
766 771  
767   - printk("BUG: MAX_LOCKDEP_KEYS too low!\n");
768   - printk("turning off the locking correctness validator.\n");
769   - printk("Attach output of /proc/lock_stat to bug report\n");
  772 + print_lockdep_off("BUG: MAX_LOCKDEP_KEYS too low!");
770 773 dump_stack();
771 774 return NULL;
772 775 }
... ... @@ -836,9 +839,7 @@
836 839 if (!debug_locks_off_graph_unlock())
837 840 return NULL;
838 841  
839   - printk("BUG: MAX_LOCKDEP_ENTRIES too low!\n");
840   - printk("turning off the locking correctness validator.\n");
841   - printk("Attach output of /proc/lock_stat to bug report\n");
  842 + print_lockdep_off("BUG: MAX_LOCKDEP_ENTRIES too low!");
842 843 dump_stack();
843 844 return NULL;
844 845 }
... ... @@ -2051,9 +2052,7 @@
2051 2052 if (!debug_locks_off_graph_unlock())
2052 2053 return 0;
2053 2054  
2054   - printk("BUG: MAX_LOCKDEP_CHAINS too low!\n");
2055   - printk("turning off the locking correctness validator.\n");
2056   - printk("Attach output of /proc/lock_stat to bug report\n");
  2055 + print_lockdep_off("BUG: MAX_LOCKDEP_CHAINS too low!");
2057 2056 dump_stack();
2058 2057 return 0;
2059 2058 }
2060 2059  
... ... @@ -3192,10 +3191,9 @@
3192 3191 #endif
3193 3192 if (unlikely(curr->lockdep_depth >= MAX_LOCK_DEPTH)) {
3194 3193 debug_locks_off();
3195   - printk("BUG: MAX_LOCK_DEPTH too low, depth: %i max: %lu!\n",
  3194 + print_lockdep_off("BUG: MAX_LOCK_DEPTH too low!");
  3195 + printk(KERN_DEBUG "depth: %i max: %lu!\n",
3196 3196 curr->lockdep_depth, MAX_LOCK_DEPTH);
3197   - printk("turning off the locking correctness validator.\n");
3198   - printk("Attach output of /proc/lock_stat to bug report\n");
3199 3197  
3200 3198 lockdep_print_held_locks(current);
3201 3199 debug_show_all_locks();