diff options
| author | Ingo Molnar <mingo@kernel.org> | 2020-05-28 11:52:53 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2020-05-28 11:52:53 +0300 |
| commit | 58ef57b16d9e91cce1c640a6fe8a21d53a85181d (patch) | |
| tree | d0f01006c085256fb2b7d9c6030a9425a931ba84 /include/linux/sched.h | |
| parent | 498bdcdb949e879d4a45f415468aef802a3dff4a (diff) | |
| parent | 806f04e9fd2c6ad1e39bc2dba77155be0e4becde (diff) | |
| download | linux-58ef57b16d9e91cce1c640a6fe8a21d53a85181d.tar.xz | |
Merge branch 'core/rcu' into sched/core, to pick up dependency
We are going to rely on the loosening of RCU callback semantics,
introduced by this commit:
806f04e9fd2c: ("rcu: Allow for smp_call_function() running callbacks from idle")
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/sched.h')
| -rw-r--r-- | include/linux/sched.h | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index d4ea4407cd6d..ebc68706152a 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -613,7 +613,7 @@ union rcu_special { u8 blocked; u8 need_qs; u8 exp_hint; /* Hint for performance. */ - u8 deferred_qs; + u8 need_mb; /* Readers need smp_mb(). */ } b; /* Bits. */ u32 s; /* Set of bits. */ }; @@ -724,6 +724,14 @@ struct task_struct { struct list_head rcu_tasks_holdout_list; #endif /* #ifdef CONFIG_TASKS_RCU */ +#ifdef CONFIG_TASKS_TRACE_RCU + int trc_reader_nesting; + int trc_ipi_to_cpu; + union rcu_special trc_reader_special; + bool trc_reader_checked; + struct list_head trc_holdout_list; +#endif /* #ifdef CONFIG_TASKS_TRACE_RCU */ + struct sched_info sched_info; struct list_head tasks; @@ -1289,6 +1297,12 @@ struct task_struct { unsigned long prev_lowest_stack; #endif +#ifdef CONFIG_X86_MCE + u64 mce_addr; + u64 mce_status; + struct callback_head mce_kill_me; +#endif + /* * New fields for task_struct should be added above here, so that * they are included in the randomized portion of task_struct. |