Merge branch 'linus' into cpus4096

Conflicts:

	kernel/stop_machine.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

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,
                  * rdp->cpu is the current cpu.
                  *
                  * cpu_online_map is updated by the _cpu_down()
-                 * using stop_machine_run(). Since we're in irqs disabled
-                 * section, stop_machine_run() is not exectuting, hence
+                 * using __stop_machine(). Since we're in irqs disabled
+                 * section, __stop_machine() is not exectuting, hence
                  * the cpu_online_map is stable.
                  *
                  * However,  a cpu might have been offlined _just_ before