Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 09488165 authored by Jan Beulich's avatar Jan Beulich Committed by Linus Torvalds
Browse files

i386: smp-alt-once option is only useful with HOTPLUG_CPU 



Hence remove its handling in the opposite case.

Signed-off-by: default avatarJan Beulich <jbeulich@novell.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d567b6a9

arch/i386/kernel/alternative.c

+9 −5
Original line number Diff line number Diff line
@@ -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