path: root/arch/x86/kernel/vsmp_64.c
diff options
authorRavikiran G Thirumalai <kiran@scalex86.org>2009-03-23 23:14:29 -0700
committerIngo Molnar <mingo@elte.hu>2009-03-25 21:34:28 +0100
commit70511134f61bd6e5eed19f767381f9fb3e762d49 (patch)
tree43d2b1240d62f1ed2fef5f0bdd0d9fa3b96555ba /arch/x86/kernel/vsmp_64.c
parente06b1b56f9bfcc91e1f175fe8d8bf3e35dafa080 (diff)
Revert "x86: don't compile vsmp_64 for 32bit"
Partial revert of commit 129d8bc828e011bda0b7110a097bf3a0167f966e 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: Ravikiran 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: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/vsmp_64.c')
1 files changed, 11 insertions, 1 deletions
diff --git a/arch/x86/kernel/vsmp_64.c b/arch/x86/kernel/vsmp_64.c
index 74de562812c..a1d804bcd48 100644
--- a/arch/x86/kernel/vsmp_64.c
+++ b/arch/x86/kernel/vsmp_64.c
@@ -22,7 +22,7 @@
#include <asm/paravirt.h>
#include <asm/setup.h>
+#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)
+#ifdef CONFIG_PCI
static int is_vsmp = -1;
static void __init detect_vsmp_box(void)
@@ -139,6 +140,15 @@ int is_vsmp_box(void)
+static void __init detect_vsmp_box(void)
+int is_vsmp_box(void)
+ return 0;
void __init vsmp_init(void)