diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-11 11:30:15 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-11-11 11:30:15 -0800 |
| commit | 961767b75d63c21aa60ee3ccf940288c3c1afde6 (patch) | |
| tree | 2ba45f33bcd7998fd52a1f423e76265370953054 /kernel/rcutree.h | |
| parent | 1fd18a871a0761633d02d0536ecb4a311d92a3d3 (diff) | |
| parent | d4515646699b6ad7b1a98ceb871296b957f3ef47 (diff) | |
| download | op-kernel-dev-961767b75d63c21aa60ee3ccf940288c3c1afde6.zip op-kernel-dev-961767b75d63c21aa60ee3ccf940288c3c1afde6.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:
highmem: Fix debug_kmap_atomic() to also handle KM_IRQ_PTE, KM_NMI, and KM_NMI_PTE
highmem: Fix race in debug_kmap_atomic() which could cause warn_count to underflow
rcu: Fix long-grace-period race between forcing and initialization
uids: Prevent tear down race
Diffstat (limited to 'kernel/rcutree.h')
| -rw-r--r-- | kernel/rcutree.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/kernel/rcutree.h b/kernel/rcutree.h index 1823c6e..1899023 100644 --- a/kernel/rcutree.h +++ b/kernel/rcutree.h @@ -201,9 +201,10 @@ struct rcu_data { }; /* Values for signaled field in struct rcu_state. */ -#define RCU_GP_INIT 0 /* Grace period being initialized. */ -#define RCU_SAVE_DYNTICK 1 /* Need to scan dyntick state. */ -#define RCU_FORCE_QS 2 /* Need to force quiescent state. */ +#define RCU_GP_IDLE 0 /* No grace period in progress. */ +#define RCU_GP_INIT 1 /* Grace period being initialized. */ +#define RCU_SAVE_DYNTICK 2 /* Need to scan dyntick state. */ +#define RCU_FORCE_QS 3 /* Need to force quiescent state. */ #ifdef CONFIG_NO_HZ #define RCU_SIGNAL_INIT RCU_SAVE_DYNTICK #else /* #ifdef CONFIG_NO_HZ */ |
