aboutsummaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2011-11-14 07:13:49 -0500
committerLuis Henriques <luis.henriques@canonical.com>2012-03-08 07:23:28 -0500
commitc3a815810b6eaa7df07903316f8d2afb006fb8d0 (patch)
treed068c62619e190ca50344a57e2d171769493ef81 /kernel
parent98b52b163bb97678e4c2af49a40cce3d359ae588 (diff)
lockdep, bug: Exclude TAINT_FIRMWARE_WORKAROUND from disabling lockdep
BugLink: http://bugs.launchpad.net/bugs/931719 commit df754e6af2f237a6c020c0daff55a1a609338e31 upstream. It's unlikely that TAINT_FIRMWARE_WORKAROUND causes false lockdep messages, so do not disable lockdep in that case. We still want to keep lockdep disabled in the TAINT_OOT_MODULE case: - bin-only modules can cause various instabilities in their and in unrelated kernel code - they are impossible to debug for kernel developers - they also typically do not have the copyright license permission to link to the GPL-ed lockdep code. Suggested-by: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/n/tip-xopopjjens57r0i13qnyh2yo@git.kernel.org Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/panic.c12
1 files changed, 10 insertions, 2 deletions
diff --git a/kernel/panic.c b/kernel/panic.c
index 69231670eb9..8e48cf6ab56 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -236,8 +236,16 @@ void add_taint(unsigned flag)
236 * Also we want to keep up lockdep for staging development and 236 * Also we want to keep up lockdep for staging development and
237 * post-warning case. 237 * post-warning case.
238 */ 238 */
239 if (flag != TAINT_CRAP && flag != TAINT_WARN && __debug_locks_off()) 239 switch (flag) {
240 printk(KERN_WARNING "Disabling lock debugging due to kernel taint\n"); 240 case TAINT_CRAP:
241 case TAINT_WARN:
242 case TAINT_FIRMWARE_WORKAROUND:
243 break;
244
245 default:
246 if (__debug_locks_off())
247 printk(KERN_WARNING "Disabling lock debugging due to kernel taint\n");
248 }
241 249
242 set_bit(flag, &tainted_mask); 250 set_bit(flag, &tainted_mask);
243} 251}