diff --git a/[refs] b/[refs] index 1dffc40bae18..a42109545781 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 551b4048b3d4acf15aff9fe4aed89b892c135b02 +refs/heads/master: faf6861ebd776871e77b761c43ec045cd20b5716 diff --git a/trunk/kernel/trace/trace.c b/trunk/kernel/trace/trace.c index c580233add95..1a1c5a6ab24e 100644 --- a/trunk/kernel/trace/trace.c +++ b/trunk/kernel/trace/trace.c @@ -3736,7 +3736,7 @@ static struct notifier_block trace_die_notifier = { * it if we decide to change what log level the ftrace dump * should be at. */ -#define KERN_TRACE KERN_INFO +#define KERN_TRACE KERN_EMERG static void trace_printk_seq(struct trace_seq *s)