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

Commit 129d8bc8 authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

x86: don't compile vsmp_64 for 32bit 



Impact: cleanup

that is only needed when CONFIG_X86_VSMP is defined with 64bit
also remove dead code about PCI, because CONFIG_X86_VSMP depends on PCI

Signed-off-by: default avatarYinghai Lu <yinghai@kernel.org>
Cc: Ravikiran Thirumalai <kiran@scalex86.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 2b6163bf

arch/x86/include/asm/apic.h

+7 −0
Original line number Diff line number Diff line
@@ -75,7 +75,14 @@ static inline void default_inquire_remote_apic(int apicid) 
#define setup_secondary_clock setup_secondary_APIC_clock

#endif



#ifdef CONFIG_X86_VSMP

extern int is_vsmp_box(void);

#else

static inline int is_vsmp_box(void)

{

	return 0;

}

#endif

extern void xapic_wait_icr_idle(void);

extern u32 safe_xapic_wait_icr_idle(void);

extern void xapic_icr_write(u32, u32);

arch/x86/include/asm/setup.h

+4 −0
Original line number Diff line number Diff line
@@ -64,7 +64,11 @@ extern void x86_quirk_time_init(void); 
#include <asm/bootparam.h>



/* Interrupt control for vSMPowered x86_64 systems */

#ifdef CONFIG_X86_VSMP

void vsmp_init(void);

#else

static inline void vsmp_init(void) { }

#endif



void setup_bios_corruption_check(void);

arch/x86/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ obj-$(CONFIG_FUNCTION_GRAPH_TRACER) += ftrace.o 
obj-$(CONFIG_KEXEC)		+= machine_kexec_$(BITS).o

obj-$(CONFIG_KEXEC)		+= relocate_kernel_$(BITS).o crash.o

obj-$(CONFIG_CRASH_DUMP)	+= crash_dump_$(BITS).o

obj-y				+= vsmp_64.o

obj-$(CONFIG_X86_VSMP)		+= vsmp_64.o

obj-$(CONFIG_KPROBES)		+= kprobes.o

obj-$(CONFIG_MODULES)		+= module_$(BITS).o

obj-$(CONFIG_EFI) 		+= efi.o efi_$(BITS).o efi_stub_$(BITS).o

arch/x86/kernel/setup.c

+0 −2
Original line number Diff line number Diff line
@@ -863,9 +863,7 @@ void __init setup_arch(char **cmdline_p) 


	reserve_initrd();



#ifdef CONFIG_X86_64

	vsmp_init();

#endif



	io_delay_init();

arch/x86/kernel/vsmp_64.c

+1 −11
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
#include <asm/paravirt.h>

#include <asm/setup.h>



#if defined CONFIG_PCI && defined CONFIG_PARAVIRT

#ifdef CONFIG_PARAVIRT

/*

 * Interrupt control on vSMPowered systems:

 * ~AC is a shadow of IF.  If IF is 'on' AC should be 'off'
@@ -114,7 +114,6 @@ static void __init set_vsmp_pv_ops(void) 
}

#endif



#ifdef CONFIG_PCI

static int is_vsmp = -1;



static void __init detect_vsmp_box(void)
@@ -139,15 +138,6 @@ int is_vsmp_box(void) 
		return 0;

	}

}

#else

static void __init detect_vsmp_box(void)

{

}

int is_vsmp_box(void)

{

	return 0;

}

#endif



void __init vsmp_init(void)

{