diff options
author | Ingo Molnar <mingo@elte.hu> | 2012-02-28 04:16:01 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2012-02-28 04:16:10 -0500 |
commit | bdd4431c8d071491a68a65d9457996f222b5ecd3 (patch) | |
tree | 9de69701cdba1dd28bcb804476bff07806f6d7a3 /include/linux/sched.h | |
parent | 586c6e7013c8cbb8c91aaa6568ec349b1dc2c691 (diff) | |
parent | 1cc85961e214773cb7d7f2ccbe3bc644dd466df0 (diff) |
Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu
The major features of this series are:
- making RCU more aggressive about entering dyntick-idle mode in order to
improve energy efficiency
- converting a few more call_rcu()s to kfree_rcu()s
- applying a number of rcutree fixes and cleanups to rcutiny
- removing CONFIG_SMP #ifdefs from treercu
- allowing RCU CPU stall times to be set via sysfs
- adding CPU-stall capability to rcutorture
- adding more RCU-abuse diagnostics
- updating documentation
- fixing yet more issues located by the still-ongoing top-to-bottom
inspection of RCU, this time with a special focus on the
CPU-hotplug code path.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/sched.h')
-rw-r--r-- | include/linux/sched.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 7d379a6bfd88..e692abaf915a 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h | |||
@@ -1864,8 +1864,7 @@ extern void task_clear_jobctl_pending(struct task_struct *task, | |||
1864 | #ifdef CONFIG_PREEMPT_RCU | 1864 | #ifdef CONFIG_PREEMPT_RCU |
1865 | 1865 | ||
1866 | #define RCU_READ_UNLOCK_BLOCKED (1 << 0) /* blocked while in RCU read-side. */ | 1866 | #define RCU_READ_UNLOCK_BLOCKED (1 << 0) /* blocked while in RCU read-side. */ |
1867 | #define RCU_READ_UNLOCK_BOOSTED (1 << 1) /* boosted while in RCU read-side. */ | 1867 | #define RCU_READ_UNLOCK_NEED_QS (1 << 1) /* RCU core needs CPU response. */ |
1868 | #define RCU_READ_UNLOCK_NEED_QS (1 << 2) /* RCU core needs CPU response. */ | ||
1869 | 1868 | ||
1870 | static inline void rcu_copy_process(struct task_struct *p) | 1869 | static inline void rcu_copy_process(struct task_struct *p) |
1871 | { | 1870 | { |