Merge tag 'arm-soc-5.9' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc

[mirror_ubuntu-jammy-kernel.git] / init / init_task.c

diff --git a/init/init_task.c b/init/init_task.c
index 15303d58d9dbff39b020bbd0a5f8064437573c8a..15089d15010ab9bce6e1b34ddc8e9133011e774a 100644 (file)
--- a/init/init_task.c
+++ b/init/init_task.c
@@ -13,7 +13,6 @@
 #include <linux/numa.h>
 #include <linux/scs.h>
 
-#include <asm/pgtable.h>
 #include <linux/uaccess.h>
 
 static struct signal_struct init_signals = {
@@ -175,6 +174,16 @@ 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,
+               .scoped_accesses        = {LIST_POISON1, NULL},
+       },
+#endif
 #ifdef CONFIG_TRACE_IRQFLAGS
        .softirqs_enabled = 1,
 #endif