diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-28 11:37:46 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-28 11:37:46 -0400 |
| commit | 37eaf8c7463e53cf1acf025fb566fb6c4573297f (patch) | |
| tree | 9df7e9e3e7722d9ddf257e19fd8551425d27a292 /kernel/rcuclassic.c | |
| parent | 58f250714f2bfa3514798fde8b9d38a15e4a9836 (diff) | |
| parent | 784e2d76007f90d69341b95967160c4fb7829299 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus
* git://git.kernel.org/pub/scm/linux/kernel/git/rusty/linux-2.6-for-linus:
stop_machine: fix up ftrace.c
stop_machine: Wean existing callers off stop_machine_run()
stop_machine(): stop_machine_run() changed to use cpu mask
Hotplug CPU: don't check cpu_online after take_cpu_down
Simplify stop_machine
stop_machine: add ALL_CPUS option
module: fix build warning with !CONFIG_KALLSYMS
Diffstat (limited to 'kernel/rcuclassic.c')
| -rw-r--r-- | kernel/rcuclassic.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/rcuclassic.c b/kernel/rcuclassic.c index 6f8696c502f4..aad93cdc9f68 100644 --- a/kernel/rcuclassic.c +++ b/kernel/rcuclassic.c | |||
| @@ -91,8 +91,8 @@ static void force_quiescent_state(struct rcu_data *rdp, | |||
| 91 | * rdp->cpu is the current cpu. | 91 | * rdp->cpu is the current cpu. |
| 92 | * | 92 | * |
| 93 | * cpu_online_map is updated by the _cpu_down() | 93 | * cpu_online_map is updated by the _cpu_down() |
| 94 | * using stop_machine_run(). Since we're in irqs disabled | 94 | * using __stop_machine(). Since we're in irqs disabled |
| 95 | * section, stop_machine_run() is not exectuting, hence | 95 | * section, __stop_machine() is not exectuting, hence |
| 96 | * the cpu_online_map is stable. | 96 | * the cpu_online_map is stable. |
| 97 | * | 97 | * |
| 98 | * However, a cpu might have been offlined _just_ before | 98 | * However, a cpu might have been offlined _just_ before |