diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-11-10 04:10:31 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-11-10 04:10:35 +0100 |
| commit | 7e1a2766e67a529f62c8cfba0a47d63fc4f7fa8a (patch) | |
| tree | 197950369a773afdf04af9bdfc4a2ce1d2b5d3af /kernel/rcutree.h | |
| parent | c5e0cb3ddc5f14cedcfc50c0fb3b5fc6b56576da (diff) | |
| parent | 83f5b01ffbbaea6f97c9a79d21e240dbfb69f2f1 (diff) | |
| download | op-kernel-dev-7e1a2766e67a529f62c8cfba0a47d63fc4f7fa8a.zip op-kernel-dev-7e1a2766e67a529f62c8cfba0a47d63fc4f7fa8a.tar.gz | |
Merge branch 'core/urgent' into core/rcu
Merge reason: Pick up RCU fixlet to base further commits on.
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'kernel/rcutree.h')
| -rw-r--r-- | kernel/rcutree.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/kernel/rcutree.h b/kernel/rcutree.h index 599161f..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 */ @@ -306,9 +307,9 @@ static void rcu_print_task_stall(struct rcu_node *rnp); #endif /* #ifdef CONFIG_RCU_CPU_STALL_DETECTOR */ static void rcu_preempt_check_blocked_tasks(struct rcu_node *rnp); #ifdef CONFIG_HOTPLUG_CPU -static void rcu_preempt_offline_tasks(struct rcu_state *rsp, - struct rcu_node *rnp, - struct rcu_data *rdp); +static int rcu_preempt_offline_tasks(struct rcu_state *rsp, + struct rcu_node *rnp, + struct rcu_data *rdp); static void rcu_preempt_offline_cpu(int cpu); #endif /* #ifdef CONFIG_HOTPLUG_CPU */ static void rcu_preempt_check_callbacks(int cpu); |
