Merge branch 'rework/kthreads' into for-linus

[sfrench/cifs-2.6.git] / kernel / panic.c

diff --git a/kernel/panic.c b/kernel/panic.c
index a3c758dba15ab68c3d43069797ba462f60cfa6e8..a3308af28a2133715391972d8cec23e001af3d84 100644 (file)
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -603,8 +603,6 @@ void __warn(const char *file, int line, void *caller, unsigned taint,
 {
        disable_trace_on_warning();
 
-       printk_prefer_direct_enter();
-
        if (file)
                pr_warn("WARNING: CPU: %d PID: %d at %s:%d %pS\n",
                        raw_smp_processor_id(), current->pid, file, line,
@@ -634,8 +632,6 @@ void __warn(const char *file, int line, void *caller, unsigned taint,
 
        /* Just a warning, don't kill lockdep. */
        add_taint(taint, LOCKDEP_STILL_OK);
-
-       printk_prefer_direct_exit();
 }
 
 #ifndef __WARN_FLAGS