From 4a18a3715fc1e223d94658cc930a010030451297 Mon Sep 17 00:00:00 2001
From: Dave Airlie <airlied@redhat.com>
Date: Tue, 30 Nov 2010 09:15:46 +1000
Subject: [PATCH] --- yaml --- r: 222722 b: refs/heads/master c:
 bcb38ceb225f5d5b2198a2755277cd441ed1e82b h: refs/heads/master v: v3

---
 [refs]                  | 2 +-
 trunk/lib/debug_locks.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index c2af342ad0df..60b8b48336c1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 8f1b1a509658bee2397ddb9937cbfa1b71cdca17
+refs/heads/master: bcb38ceb225f5d5b2198a2755277cd441ed1e82b
diff --git a/trunk/lib/debug_locks.c b/trunk/lib/debug_locks.c
index 5bf0020b9248..b1c177307677 100644
--- a/trunk/lib/debug_locks.c
+++ b/trunk/lib/debug_locks.c
@@ -8,7 +8,6 @@
  *
  *  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>
@@ -39,7 +38,6 @@ int debug_locks_off(void)
 {
 	if (__debug_locks_off()) {
 		if (!debug_locks_silent) {
-			oops_in_progress = 1;
 			console_verbose();
 			return 1;
 		}