diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-13 11:30:26 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-04-13 11:30:26 -0700 |
| commit | bf20753c0cdf842c5c65af688c2cefd1eafa7630 (patch) | |
| tree | 8431fb73349b928d93ce02e24c1c993562fa1f95 | |
| parent | 01599fca6758d2cd133e78f87426fc851c9ea725 (diff) | |
| parent | 574bbe782057fdf0490dc7dec906a2dc26363e20 (diff) | |
| download | kernel-common-bf20753c0cdf842c5c65af688c2cefd1eafa7630.tar.gz kernel-common-bf20753c0cdf842c5c65af688c2cefd1eafa7630.tar.bz2 kernel-common-bf20753c0cdf842c5c65af688c2cefd1eafa7630.zip | |
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
lockdep: continue lock debugging despite some taints
lockdep: warn about lockdep disabling after kernel taint
| -rw-r--r-- | include/linux/debug_locks.h | 7 | ||||
| -rw-r--r-- | kernel/panic.c | 12 | ||||
| -rw-r--r-- | lib/debug_locks.c | 2 |
3 files changed, 18 insertions, 3 deletions
diff --git a/include/linux/debug_locks.h b/include/linux/debug_locks.h index 096476f1fb35..493dedb7a67b 100644 --- a/include/linux/debug_locks.h +++ b/include/linux/debug_locks.h @@ -2,12 +2,19 @@ #define __LINUX_DEBUG_LOCKING_H #include <linux/kernel.h> +#include <asm/atomic.h> struct task_struct; extern int debug_locks; extern int debug_locks_silent; + +static inline int __debug_locks_off(void) +{ + return xchg(&debug_locks, 0); +} + /* * Generic 'turn off all lock debugging' function: */ diff --git a/kernel/panic.c b/kernel/panic.c index 3fd8c5bf8b39..934fb377f4b3 100644 --- a/kernel/panic.c +++ b/kernel/panic.c @@ -213,8 +213,16 @@ unsigned long get_taint(void) void add_taint(unsigned flag) { - /* can't trust the integrity of the kernel anymore: */ - debug_locks = 0; + /* + * 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. + */ + if (flag != TAINT_CRAP && flag != TAINT_WARN && __debug_locks_off()) + printk(KERN_WARNING "Disabling lockdep due to kernel taint\n"); + set_bit(flag, &tainted_mask); } EXPORT_SYMBOL(add_taint); diff --git a/lib/debug_locks.c b/lib/debug_locks.c index 0218b4693dd8..bc3b11731b9c 100644 --- a/lib/debug_locks.c +++ b/lib/debug_locks.c @@ -36,7 +36,7 @@ int debug_locks_silent; */ int debug_locks_off(void) { - if (xchg(&debug_locks, 0)) { + if (__debug_locks_off()) { if (!debug_locks_silent) { oops_in_progress = 1; console_verbose(); |