Skip to content

Commit 6492a0f

Browse files
bwhacksgregkh
authored andcommitted
lockdep, bug: Exclude TAINT_OOT_MODULE from disabling lock debugging
commit 9ec84ac upstream. 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 2449b8b ('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: 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]> Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 1a90d01 commit 6492a0f

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

kernel/panic.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -237,11 +237,12 @@ void add_taint(unsigned flag)
237237
* Can't trust the integrity of the kernel anymore.
238238
* We don't call directly debug_locks_off() because the issue
239239
* is not necessarily serious enough to set oops_in_progress to 1
240-
* Also we want to keep up lockdep for staging development and
241-
* post-warning case.
240+
* Also we want to keep up lockdep for staging/out-of-tree
241+
* development and post-warning case.
242242
*/
243243
switch (flag) {
244244
case TAINT_CRAP:
245+
case TAINT_OOT_MODULE:
245246
case TAINT_WARN:
246247
case TAINT_FIRMWARE_WORKAROUND:
247248
break;

0 commit comments

Comments
 (0)