Commit 70511134 authored by Ravikiran G Thirumalai's avatar Ravikiran G Thirumalai Committed by Ingo Molnar
Browse files

Revert "x86: don't compile vsmp_64 for 32bit" 



Partial revert of commit 129d8bc8
titled 'x86: don't compile vsmp_64 for 32bit'

Commit reverted to compile vsmp_64.c if CONFIG_X86_64 is defined,
since is_vsmp_box() needs to indicate that TSCs are not synchronized, and
hence, not a valid time source, even when CONFIG_X86_VSMP is not defined.

Signed-off-by: default avatarRavikiran Thirumalai <kiran@scalex86.org>
Cc: Yinghai Lu <yinghai@kernel.org>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: shai@scalex86.org
LKML-Reference: <20090324061429.GH7278@localdomain>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent e06b1b56

arch/x86/include/asm/apic.h

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

#endif



#ifdef CONFIG_X86_VSMP

#ifdef CONFIG_X86_64

extern int is_vsmp_box(void);

#else

static inline int is_vsmp_box(void)

arch/x86/include/asm/setup.h

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



/* Interrupt control for vSMPowered x86_64 systems */

#ifdef CONFIG_X86_VSMP

#ifdef CONFIG_X86_64

void vsmp_init(void);

#else

static inline void vsmp_init(void) { }

arch/x86/kernel/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ 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-$(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
@@ -120,4 +119,5 @@ ifeq ($(CONFIG_X86_64),y) 
	obj-$(CONFIG_AMD_IOMMU)		+= amd_iommu_init.o amd_iommu.o



	obj-$(CONFIG_PCI_MMCONFIG)	+= mmconf-fam10h_64.o

	obj-y				+= vsmp_64.o

endif

arch/x86/kernel/vsmp_64.c

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

#include <asm/setup.h>



#ifdef CONFIG_PARAVIRT

#if defined CONFIG_PCI && defined CONFIG_PARAVIRT

/*

 * Interrupt control on vSMPowered systems:

 * ~AC is a shadow of IF.  If IF is 'on' AC should be 'off'
@@ -114,6 +114,7 @@ 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,6 +140,15 @@ int is_vsmp_box(void) 
	}

}



#else

static void __init detect_vsmp_box(void)

{

}

int is_vsmp_box(void)

{

	return 0;

}

#endif

void __init vsmp_init(void)

{

	detect_vsmp_box();

CRA Git | Maintained and supported by SUSTech CRA and CCSE