commit b5c21b4514b38f450848feb432f7120376d01ffe
author Steven Rostedt <rostedt@goodmis.org> Thu Jul 10 20:58:12 2008 -0400
committer Ingo Molnar <mingo@elte.hu> Fri Jul 11 15:49:19 2008 +0200
tree cb1309db3cecd0aeef9ca1e546f731c8c04faef4
parent 1e16c0a081f6c93f04c6af784d6a160955269f91

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>

kernel/trace/trace.c

diff --git a/kernel/trace/trace.c b/kernel/trace/trace.c
index 9ade793..f8fdb9c 100644
--- a/kernel/trace/trace.c
+++ b/kernel/trace/trace.c
@@ -1341,7 +1341,7 @@
 		   "server",
 #elif defined(CONFIG_PREEMPT_VOLUNTARY)
 		   "desktop",
-#elif defined(CONFIG_PREEMPT_DESKTOP)
+#elif defined(CONFIG_PREEMPT)
 		   "preempt",
 #else
 		   "unknown",