]> err.no Git - linux-2.6/commitdiff
ftrace: check proper config for preempt type
authorSteven Rostedt <rostedt@goodmis.org>
Fri, 11 Jul 2008 00:58:12 +0000 (20:58 -0400)
committerIngo Molnar <mingo@elte.hu>
Fri, 11 Jul 2008 13:49:19 +0000 (15:49 +0200)
There is no CONFIG_PREEMPT_DESKTOP. Use the proper entry CONFIG_PREEMPT.

Signed-off-by: Steven Rostedt <srostedt@redhat.com>
Cc: Steven Rostedt <srostedt@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
kernel/trace/trace.c

index 9ade79369bfb07f342e5942d73f3e0fd891cebd6..f8fdb9cedc2445f9753d32f8570751875b24d54b 100644 (file)
@@ -1341,7 +1341,7 @@ print_trace_header(struct seq_file *m, struct trace_iterator *iter)
                   "server",
 #elif defined(CONFIG_PREEMPT_VOLUNTARY)
                   "desktop",
-#elif defined(CONFIG_PREEMPT_DESKTOP)
+#elif defined(CONFIG_PREEMPT)
                   "preempt",
 #else
                   "unknown",