diff options
| author | Ravikiran G Thirumalai <kiran@scalex86.org> | 2009-03-24 02:14:29 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-25 16:34:28 -0400 |
| commit | 70511134f61bd6e5eed19f767381f9fb3e762d49 (patch) | |
| tree | 43d2b1240d62f1ed2fef5f0bdd0d9fa3b96555ba /arch/x86/include/asm/apic.h | |
| parent | e06b1b56f9bfcc91e1f175fe8d8bf3e35dafa080 (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/include/asm/apic.h')
| -rw-r--r-- | arch/x86/include/asm/apic.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h index 130a9e2b4586..df8a300dfe6c 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h | |||
| @@ -75,7 +75,7 @@ static inline void default_inquire_remote_apic(int apicid) | |||
| 75 | #define setup_secondary_clock setup_secondary_APIC_clock | 75 | #define setup_secondary_clock setup_secondary_APIC_clock |
| 76 | #endif | 76 | #endif |
| 77 | 77 | ||
| 78 | #ifdef CONFIG_X86_VSMP | 78 | #ifdef CONFIG_X86_64 |
| 79 | extern int is_vsmp_box(void); | 79 | extern int is_vsmp_box(void); |
| 80 | #else | 80 | #else |
| 81 | static inline int is_vsmp_box(void) | 81 | static inline int is_vsmp_box(void) |