summaryrefslogtreecommitdiff
path: root/init/init_task.c
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo <acme@redhat.com>2022-01-13 10:20:59 -0300
committerArnaldo Carvalho de Melo <acme@redhat.com>2022-01-13 10:20:59 -0300
commit1aa77e716c6f2332f2d4664f747ff4eba731825b (patch)
treebffb043cec73da6c79d4ec652e531f86344b160b /init/init_task.c
parentc0dd94558d0e473aa92254e1c48a47900c911e69 (diff)
parent455e73a07f6e288b0061dfcf4fcf54fa9fe06458 (diff)
Merge remote-tracking branch 'torvalds/master' into perf/core
To pick up fixes and get in line with other trees, powerpc kernel mostly this time, but BPF as well. Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'init/init_task.c')
-rw-r--r--init/init_task.c5
1 files changed, 0 insertions, 5 deletions
diff --git a/init/init_task.c b/init/init_task.c
index 2d024066e27b..73cc8f03511a 100644
--- a/init/init_task.c
+++ b/init/init_task.c
@@ -182,11 +182,6 @@ struct task_struct init_task
#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