summaryrefslogtreecommitdiffstats
path: root/kernel/trace
diff options
context:
space:
mode:
authorSteven Rostedt <rostedt@goodmis.org>2008-07-10 20:58:12 -0400
committerIngo Molnar <mingo@elte.hu>2008-07-11 15:49:19 +0200
commitb5c21b4514b38f450848feb432f7120376d01ffe (patch)
treecb1309db3cecd0aeef9ca1e546f731c8c04faef4 /kernel/trace
parent1e16c0a081f6c93f04c6af784d6a160955269f91 (diff)
downloadop-kernel-dev-b5c21b4514b38f450848feb432f7120376d01ffe.zip
op-kernel-dev-b5c21b4514b38f450848feb432f7120376d01ffe.tar.gz
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>
Diffstat (limited to 'kernel/trace')
-rw-r--r--kernel/trace/trace.c2
1 files changed, 1 insertions, 1 deletions
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 @@ 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",
OpenPOWER on IntegriCloud