diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-21 09:06:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-09-21 09:06:52 -0700 |
| commit | b8c7f1dc5ca4e0d10709182233cdab932cef593d (patch) | |
| tree | 28c5f79d61ce7167511f18eaed5c9fca87c68ab4 /include/linux/sched.h | |
| parent | f4eccb6d979e0cc5a719a50af5f9a56e79092a2d (diff) | |
| parent | a71fca58b7f4abca551ae2256ac08dd9123a03f9 (diff) | |
| download | op-kernel-dev-b8c7f1dc5ca4e0d10709182233cdab932cef593d.zip op-kernel-dev-b8c7f1dc5ca4e0d10709182233cdab932cef593d.tar.gz | |
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
rcu: Fix whitespace inconsistencies
rcu: Fix thinko, actually initialize full tree
rcu: Apply results of code inspection of kernel/rcutree_plugin.h
rcu: Add WARN_ON_ONCE() consistency checks covering state transitions
rcu: Fix synchronize_rcu() for TREE_PREEMPT_RCU
rcu: Simplify rcu_read_unlock_special() quiescent-state accounting
rcu: Add debug checks to TREE_PREEMPT_RCU for premature grace periods
rcu: Kconfig help needs to say that TREE_PREEMPT_RCU scales down
rcutorture: Occasionally delay readers enough to make RCU force_quiescent_state
rcu: Initialize multi-level RCU grace periods holding locks
rcu: Need to update rnp->gpnum if preemptable RCU is to be reliable
Diffstat (limited to 'include/linux/sched.h')
| -rw-r--r-- | include/linux/sched.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 239c8e0..115af05 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1755,7 +1755,6 @@ extern cputime_t task_gtime(struct task_struct *p); #define RCU_READ_UNLOCK_BLOCKED (1 << 0) /* blocked while in RCU read-side. */ #define RCU_READ_UNLOCK_NEED_QS (1 << 1) /* RCU core needs CPU response. */ -#define RCU_READ_UNLOCK_GOT_QS (1 << 2) /* CPU has responded to RCU core. */ static inline void rcu_copy_process(struct task_struct *p) { |
