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

Commit 550fe4f1 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

x86/Voyager: remove X86_FIND_SMP_CONFIG Kconfig quirk 



x86/Voyager had this Kconfig quirk:

 config X86_FIND_SMP_CONFIG
	def_bool y
	depends on X86_MPPARSE || X86_VOYAGER

Which splits off the find_smp_config() callback into a build-time quirk.

Voyager should use the existing x86_quirks.mach_find_smp_config() callback
to introduce SMP-config quirks. NUMAQ-32 and VISWS already use this.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent f095df0a

arch/x86/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -254,10 +254,6 @@ config NUMA_MIGRATE_IRQ_DESC 


	  If you don't know what to do here, say N.



config X86_FIND_SMP_CONFIG

	def_bool y

	depends on X86_MPPARSE || X86_VOYAGER



config X86_MPPARSE

	bool "Enable MPS table" if ACPI

	default y

arch/x86/include/asm/mpspec.h

+3 −1
Original line number Diff line number Diff line
@@ -56,11 +56,13 @@ extern int smp_found_config; 
extern int mpc_default_type;

extern unsigned long mp_lapic_addr;



extern void find_smp_config(void);

extern void get_smp_config(void);



#ifdef CONFIG_X86_MPPARSE

extern void find_smp_config(void);

extern void early_reserve_e820_mpc_new(void);

#else

static inline void find_smp_config(void) { }

static inline void early_reserve_e820_mpc_new(void) { }

#endif

arch/x86/kernel/setup.c

+1 −2
Original line number Diff line number Diff line
@@ -905,12 +905,11 @@ void __init setup_arch(char **cmdline_p) 
	 */

	acpi_reserve_bootmem();

#endif

#ifdef CONFIG_X86_FIND_SMP_CONFIG

	/*

	 * Find and reserve possible boot-time SMP configuration:

	 */

	find_smp_config();

#endif



	reserve_crashkernel();



#ifdef CONFIG_X86_64