diff --git a/[refs] b/[refs] index 3e58d543767d..5bc8ddb10113 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 471b40d0dfc17bf0161629950b82524d41bc37ce +refs/heads/master: 068c4579fe5c21e84c7cb2ba89db80899e25104e diff --git a/trunk/kernel/panic.c b/trunk/kernel/panic.c index 9b8dcfd1ca93..8010b9b17aca 100644 --- a/trunk/kernel/panic.c +++ b/trunk/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);