Merge tag 'v5.5-rc4' into locking/kcsan, to resolve conflicts

[linux-2.6-microblaze.git] / include / linux / sched.h

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 467d260..b511e17 100644 (file)
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -31,6 +31,7 @@
 #include <linux/task_io_accounting.h>
 #include <linux/posix-timers.h>
 #include <linux/rseq.h>
+#include <linux/kcsan.h>
 
 /* task_struct member predeclarations (sorted alphabetically): */
 struct audit_context;
@@ -1179,6 +1180,9 @@ struct task_struct {
 #ifdef CONFIG_KASAN
        unsigned int                    kasan_depth;
 #endif
+#ifdef CONFIG_KCSAN
+       struct kcsan_ctx                kcsan_ctx;
+#endif
 
 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
        /* Index of current stored address in ret_stack: */