Merge tag 'v5.7-rc1' into locking/kcsan, to resolve conflicts and refresh

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

diff --git a/init/init_task.c b/init/init_task.c
index bd403ed3e4184041a32906e7b03245787778f39f..de5db6de5211d0c04c80a275795307a46ed150d2 100644 (file)
--- a/init/init_task.c
+++ b/init/init_task.c
@@ -162,6 +162,15 @@ struct task_struct init_task
 #ifdef CONFIG_KASAN
        .kasan_depth    = 1,
 #endif
+#ifdef CONFIG_KCSAN
+       .kcsan_ctx = {
+               .disable_count          = 0,
+               .atomic_next            = 0,
+               .atomic_nest_count      = 0,
+               .in_flat_atomic         = false,
+               .access_mask            = 0,
+       },
+#endif
 #ifdef CONFIG_TRACE_IRQFLAGS
        .softirqs_enabled = 1,
 #endif