Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-drm-fsl-dcu.git] / include / linux / sched.h

diff --git a/include/linux/sched.h b/include/linux/sched.h
index cb5cdc777c8a9004d1e956d4705c40c8bfac6a66..6d77432e14ff971bffd4ca211dccb917768b2c8c 100644 (file)
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -1374,6 +1374,8 @@ struct task_struct {
 
        unsigned long atomic_flags; /* Flags needing atomic access. */
 
+       struct restart_block restart_block;
+
        pid_t pid;
        pid_t tgid;
 
@@ -1666,6 +1668,9 @@ struct task_struct {
        unsigned long timer_slack_ns;
        unsigned long default_timer_slack_ns;
 
+#ifdef CONFIG_KASAN
+       unsigned int kasan_depth;
+#endif
 #ifdef CONFIG_FUNCTION_GRAPH_TRACER
        /* Index of current stored address in ret_stack */
        int curr_ret_stack;
@@ -2149,6 +2154,7 @@ extern unsigned long long notrace sched_clock(void);
  */
 extern u64 cpu_clock(int cpu);
 extern u64 local_clock(void);
+extern u64 running_clock(void);
 extern u64 sched_clock_cpu(int cpu);