From 4340a7a55a2d39fdc88bfda80a8f3454591a5ca6 Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Wed, 14 Jan 2009 12:24:42 -0500 Subject: [PATCH] --- yaml --- r: 130591 b: refs/heads/master c: faf6861ebd776871e77b761c43ec045cd20b5716 h: refs/heads/master i: 130589: c1d40b5cf62b54c05c56c46b01362d770743cb6a 130587: 68aa035128a31cafaca5aa318ddefc0490d67726 130583: 128100d2ff7eae5becb468c78bd4d4e1f1adf4b9 130575: 1a951c294f76d886e76733b89a891edb6b4f54ff 130559: 8813e85455b51189188fd60e81270afea0483bca v: v3 --- [refs] | 2 +- trunk/kernel/trace/trace.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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)