Merge tag 'compiler-attributes-for-linus-v5.4' of git://github.com/ojeda/linux

[linux.git] / init / init_task.c

diff --git a/init/init_task.c b/init/init_task.c
index 7ab773b9b3cd566c504e84d6fc06a0d869705145..9e5cbe5eab7b1143791c834afa6ece0ccdbd148f 100644 (file)
--- a/init/init_task.c
+++ b/init/init_task.c
@@ -30,8 +30,6 @@ static struct signal_struct init_signals = {
        .posix_timers = LIST_HEAD_INIT(init_signals.posix_timers),
        .cputimer       = {
                .cputime_atomic = INIT_CPUTIME_ATOMIC,
-               .running        = false,
-               .checking_timer = false,
        },
 #endif
        INIT_CPU_TIMERS(init_signals)
@@ -174,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