From: David Miller <davem@davemloft.net>
Date: Fri, 1 Aug 2008 08:11:22 +0000 (-0700)
Subject: debug_locks: set oops_in_progress if we will log messages.
X-Git-Tag: v2.6.27-rc3~50^2^2~14
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e0fdace10e75dac67d906213b780ff1b1a4cc360;p=linux-2.6-omap-h63xx.git

debug_locks: set oops_in_progress if we will log messages.

Otherwise lock debugging messages on runqueue locks can deadlock the
system due to the wakeups performed by printk().

Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

diff --git a/lib/debug_locks.c b/lib/debug_locks.c
index 0ef01d14727..0218b4693dd 100644
--- a/lib/debug_locks.c
+++ b/lib/debug_locks.c
@@ -8,6 +8,7 @@
  *
  *  Copyright (C) 2006 Red Hat, Inc., Ingo Molnar <mingo@redhat.com>
  */
+#include <linux/kernel.h>
 #include <linux/rwsem.h>
 #include <linux/mutex.h>
 #include <linux/module.h>
@@ -37,6 +38,7 @@ int debug_locks_off(void)
 {
 	if (xchg(&debug_locks, 0)) {
 		if (!debug_locks_silent) {
+			oops_in_progress = 1;
 			console_verbose();
 			return 1;
 		}