[PATCH] lockdep, bug: Exclude TAINT_OOT_MODULE from disabling lockdebugging

[Ben Hutchings]

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 <ben@xxxxxxxxxxxxxxx>
---
 kernel/panic.c |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/kernel/panic.c b/kernel/panic.c
index 1b83fd8..3458469 100644
--- 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;
-- 
1.7.7.3


--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/