From 6da1b468ac0d2360f3ff381186b785742f75dcc3 Mon Sep 17 00:00:00 2001 From: Heiko Carstens Date: Wed, 7 Jan 2009 16:19:46 +0100 Subject: [PATCH] --- yaml --- r: 126923 b: refs/heads/master c: a0e280e0f33f6c859a235fb69a875ed8f3420388 h: refs/heads/master i: 126921: 772d884db06fbf68e166bc46f7de6f0f98cc554e 126919: c0c0d5014b417ad56d49be0f74742d4d513cbfca v: v3 --- [refs] | 2 +- trunk/kernel/cpu.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9bd26c16e268..71f55314ee80 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 30aafdba6f78619274a977d67283a681bedbcbbd +refs/heads/master: a0e280e0f33f6c859a235fb69a875ed8f3420388 diff --git a/trunk/kernel/cpu.c b/trunk/kernel/cpu.c index 30e74dd6d01b..79e40f00dcb8 100644 --- a/trunk/kernel/cpu.c +++ b/trunk/kernel/cpu.c @@ -379,8 +379,11 @@ static cpumask_var_t frozen_cpus; int disable_nonboot_cpus(void) { - int cpu, first_cpu, error = 0; + int cpu, first_cpu, error; + error = stop_machine_create(); + if (error) + return error; cpu_maps_update_begin(); first_cpu = cpumask_first(cpu_online_mask); /* We take down all of the non-boot CPUs in one shot to avoid races @@ -409,6 +412,7 @@ int disable_nonboot_cpus(void) printk(KERN_ERR "Non-boot CPUs are not disabled\n"); } cpu_maps_update_done(); + stop_machine_destroy(); return error; }