From: Steven Rostedt <rostedt@goodmis.org>
Date: Fri, 11 Jul 2008 00:58:12 +0000 (-0400)
Subject: ftrace: check proper config for preempt type
X-Git-Tag: v2.6.27-rc1~1102^2^2^2~5
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5c21b4514b38f450848feb432f7120376d01ffe;p=linux-2.6

ftrace: check proper config for preempt type

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>
---

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 9ade79369b..f8fdb9cedc 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -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",