From 570af461766c41a30d03d9b290e17afe5484a807 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner Date: Sun, 5 Oct 2008 16:52:24 +0200 Subject: [PATCH] --- yaml --- r: 113576 b: refs/heads/master c: 649c6653fa94ec8f3ea32b19c97b790ec4e8e4ac h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/alternative.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 9578d68e606e..5d175ec69885 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8a541665b9063c5006b370d4488cf9f6beb6083f +refs/heads/master: 649c6653fa94ec8f3ea32b19c97b790ec4e8e4ac diff --git a/trunk/arch/x86/kernel/alternative.c b/trunk/arch/x86/kernel/alternative.c index fb04e49776ba..a84ac7b570e6 100644 --- a/trunk/arch/x86/kernel/alternative.c +++ b/trunk/arch/x86/kernel/alternative.c @@ -444,7 +444,7 @@ void __init alternative_instructions(void) _text, _etext); /* Only switch to UP mode if we don't immediately boot others */ - if (num_possible_cpus() == 1 || setup_max_cpus <= 1) + if (num_present_cpus() == 1 || setup_max_cpus <= 1) alternatives_smp_switch(0); } #endif