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

[linux-2.6-block.git] / init / init_task.c

diff --git a/init/init_task.c b/init/init_task.c
index d49692a0ec516b0d6b95d6272551903fbbdb14c2..9e5cbe5eab7b1143791c834afa6ece0ccdbd148f 100644 (file)
--- a/init/init_task.c
+++ b/init/init_task.c
@@ -172,7 +172,7 @@ struct task_struct init_task
 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
        .ret_stack      = NULL,
 #endif
-#if defined(CONFIG_TRACING) && defined(CONFIG_PREEMPT)
+#if defined(CONFIG_TRACING) && defined(CONFIG_PREEMPTION)
        .trace_recursion = 0,
 #endif
 #ifdef CONFIG_LIVEPATCH