diff options
| author | John W. Linville <linville@tuxdriver.com> | 2006-09-11 14:08:41 -0400 |
|---|---|---|
| committer | John W. Linville <linville@tuxdriver.com> | 2006-09-11 14:08:41 -0400 |
| commit | 623b3e1d645e42030897d18d37db10133d763006 (patch) | |
| tree | 090ff481cd72b47ff87d50615461712a33ba41e6 /kernel/panic.c | |
| parent | c576af479162c0a11d4e2691ebc97354958d9285 (diff) | |
| parent | 38f5745c5a90641079fd5b48600ae63f7ab6edcd (diff) | |
Merge branch 'from-linus' into upstream
Diffstat (limited to 'kernel/panic.c')
| -rw-r--r-- | kernel/panic.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/panic.c b/kernel/panic.c index 9b8dcfd1ca9..8010b9b17ac 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); |