Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-block.git] / kernel / trace / trace_events.c

diff --git a/kernel/trace/trace_events.c b/kernel/trace/trace_events.c
index 648930823b571083c1a95000937962e565162eb2..b89cdfe20bc1626b1c4632c6bfcace5eedbfe1ef 100644 (file)
--- a/kernel/trace/trace_events.c
+++ b/kernel/trace/trace_events.c
@@ -255,12 +255,12 @@ void *trace_event_buffer_reserve(struct trace_event_buffer *fbuffer,
        local_save_flags(fbuffer->flags);
        fbuffer->pc = preempt_count();
        /*
-        * If CONFIG_PREEMPT is enabled, then the tracepoint itself disables
+        * If CONFIG_PREEMPTION is enabled, then the tracepoint itself disables
         * preemption (adding one to the preempt_count). Since we are
         * interested in the preempt_count at the time the tracepoint was
         * hit, we need to subtract one to offset the increment.
         */
-       if (IS_ENABLED(CONFIG_PREEMPT))
+       if (IS_ENABLED(CONFIG_PREEMPTION))
                fbuffer->pc--;
        fbuffer->trace_file = trace_file;