|
|
@@ -1,48 +0,0 @@
|
|
|
-From 9ec84acee1e221d99dc33237bff5e82839d10cc0 Mon Sep 17 00:00:00 2001
|
|
|
-From: Ben Hutchings <[email protected]>
|
|
|
-Date: Wed, 7 Dec 2011 14:30:58 +0000
|
|
|
-Subject: [PATCH 2/2] lockdep, bug: Exclude TAINT_OOT_MODULE from disabling lock debugging
|
|
|
-
|
|
|
-We do want to allow lock debugging for GPL-compatible modules
|
|
|
-that are not (yet) built in-tree. This was disabled as a
|
|
|
-side-effect of commit 2449b8ba0745327c5fa49a8d9acffe03b2eded69
|
|
|
-('module,bug: Add TAINT_OOT_MODULE flag for modules not built
|
|
|
-in-tree'). Lock debug warnings now include taint flags, so
|
|
|
-kernel developers should still be able to deflect warnings
|
|
|
-caused by out-of-tree modules.
|
|
|
-
|
|
|
-The TAINT_PROPRIETARY_MODULE flag for non-GPL-compatible modules
|
|
|
-will still disable lock debugging.
|
|
|
-
|
|
|
-Signed-off-by: Ben Hutchings <[email protected]>
|
|
|
-Cc: Nick Bowler <[email protected]>
|
|
|
-Cc: Greg KH <[email protected]>
|
|
|
-Cc: Dave Jones <[email protected]>
|
|
|
-Cc: Rusty Russell <[email protected]>
|
|
|
-Cc: Randy Dunlap <[email protected]>
|
|
|
-Cc: Debian kernel maintainers <[email protected]>
|
|
|
-Cc: Peter Zijlstra <[email protected]>
|
|
|
-Cc: Alan Cox <[email protected]>
|
|
|
-Link: http://lkml.kernel.org/r/1323268258.18450.11.camel@deadeye
|
|
|
-Signed-off-by: Ingo Molnar <[email protected]>
|
|
|
----
|
|
|
- kernel/panic.c | 5 +++--
|
|
|
- 1 files changed, 3 insertions(+), 2 deletions(-)
|
|
|
-
|
|
|
---- a/kernel/panic.c
|
|
|
-+++ b/kernel/panic.c
|
|
|
-@@ -237,11 +237,12 @@ void add_taint(unsigned flag)
|
|
|
- * Can't trust the integrity of the kernel anymore.
|
|
|
- * We don't call directly debug_locks_off() because the issue
|
|
|
- * is not necessarily serious enough to set oops_in_progress to 1
|
|
|
-- * Also we want to keep up lockdep for staging development and
|
|
|
-- * post-warning case.
|
|
|
-+ * Also we want to keep up lockdep for staging/out-of-tree
|
|
|
-+ * development and post-warning case.
|
|
|
- */
|
|
|
- switch (flag) {
|
|
|
- case TAINT_CRAP:
|
|
|
-+ case TAINT_OOT_MODULE:
|
|
|
- case TAINT_WARN:
|
|
|
- case TAINT_FIRMWARE_WORKAROUND:
|
|
|
- break;
|