summaryrefslogtreecommitdiffstats
path: root/kernel/panic.c
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2011-12-07 14:30:58 +0000
committerIngo Molnar <mingo@elte.hu>2011-12-07 23:32:10 +0100
commit9ec84acee1e221d99dc33237bff5e82839d10cc0 (patch)
tree3767777835c3860650762498f74643a8a748146f /kernel/panic.c
parent81140acc66322dcde8346dabdf1ab4c229fce8d4 (diff)
downloadlinux-stable-9ec84acee1e221d99dc33237bff5e82839d10cc0.tar.gz
linux-stable-9ec84acee1e221d99dc33237bff5e82839d10cc0.tar.bz2
linux-stable-9ec84acee1e221d99dc33237bff5e82839d10cc0.zip
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 <ben@decadent.org.uk> Cc: Nick Bowler <nbowler@elliptictech.com> Cc: Greg KH <greg@kroah.com> Cc: Dave Jones <davej@redhat.com> Cc: Rusty Russell <rusty@rustcorp.com.au> Cc: Randy Dunlap <rdunlap@xenotime.net> Cc: Debian kernel maintainers <debian-kernel@lists.debian.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Alan Cox <alan@linux.intel.com> Link: http://lkml.kernel.org/r/1323268258.18450.11.camel@deadeye Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/panic.c')
-rw-r--r--kernel/panic.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/kernel/panic.c b/kernel/panic.c
index 1b83fd80b569..3458469eb7c3 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;