diff options
| author | Jan Beulich <jbeulich@novell.com> | 2007-07-21 17:10:25 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-07-21 18:37:09 -0700 |
| commit | 09488165d5cc795a90b789c5657b1cbd279beb16 (patch) | |
| tree | 4fe8e07ab2eca98cdcbf086081a4b26c4a1c11de /arch/i386 | |
| parent | d567b6a955c2c1a6b0e8fc13ecddc7d4ac4900a2 (diff) | |
| download | blackbird-op-linux-09488165d5cc795a90b789c5657b1cbd279beb16.tar.gz blackbird-op-linux-09488165d5cc795a90b789c5657b1cbd279beb16.zip | |
i386: smp-alt-once option is only useful with HOTPLUG_CPU
Hence remove its handling in the opposite case.
Signed-off-by: Jan Beulich <jbeulich@novell.com>
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch/i386')
| -rw-r--r-- | arch/i386/kernel/alternative.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/arch/i386/kernel/alternative.c b/arch/i386/kernel/alternative.c index d8cda14fff8b..0695be538de5 100644 --- a/arch/i386/kernel/alternative.c +++ b/arch/i386/kernel/alternative.c @@ -5,9 +5,8 @@ #include <asm/alternative.h> #include <asm/sections.h> -static int noreplace_smp = 0; -static int smp_alt_once = 0; -static int debug_alternative = 0; +#ifdef CONFIG_HOTPLUG_CPU +static int smp_alt_once; static int __init bootonly(char *str) { @@ -15,6 +14,11 @@ static int __init bootonly(char *str) return 1; } __setup("smp-alt-boot", bootonly); +#else +#define smp_alt_once 1 +#endif + +static int debug_alternative; static int __init debug_alt(char *str) { @@ -23,6 +27,8 @@ static int __init debug_alt(char *str) } __setup("debug-alternative", debug_alt); +static int noreplace_smp; + static int __init setup_noreplace_smp(char *str) { noreplace_smp = 1; @@ -376,8 +382,6 @@ void __init alternative_instructions(void) #ifdef CONFIG_HOTPLUG_CPU if (num_possible_cpus() < 2) smp_alt_once = 1; -#else - smp_alt_once = 1; #endif #ifdef CONFIG_SMP |
