summaryrefslogtreecommitdiffstats
path: root/kernel
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2006-09-06 00:03:44 -0700
committerLinus Torvalds <torvalds@g5.osdl.org>2006-09-06 11:00:02 -0700
commit068c4579fe5c21e84c7cb2ba89db80899e25104e (patch)
treeab16bf723c648d936cefb89b6dc6634145668b86 /kernel
parent471b40d0dfc17bf0161629950b82524d41bc37ce (diff)
downloadop-kernel-dev-068c4579fe5c21e84c7cb2ba89db80899e25104e.zip
op-kernel-dev-068c4579fe5c21e84c7cb2ba89db80899e25104e.tar.gz
[PATCH] lockdep: do not touch console state when tainting the kernel
Remove an unintended console_verbose() side-effect from add_taint(). Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel')
-rw-r--r--kernel/panic.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/panic.c b/kernel/panic.c
index 9b8dcfd..8010b9b 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -173,7 +173,7 @@ const char *print_tainted(void)
void add_taint(unsigned flag)
{
- debug_locks_off(); /* can't trust the integrity of the kernel anymore */
+ debug_locks = 0; /* can't trust the integrity of the kernel anymore */
tainted |= flag;
}
EXPORT_SYMBOL(add_taint);
OpenPOWER on IntegriCloud