diff options
author | Ravikiran G Thirumalai <kiran@scalex86.org> | 2008-03-20 03:41:16 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-04-17 11:41:08 -0400 |
commit | aa7d8e25eca5deb33eb08013bc78a80514349b40 (patch) | |
tree | 71075bf2c7103641377e5e182102cf8350797f8b /include/asm-x86/apic.h | |
parent | 3250c91ada16a06de5afef55bce7b766c894d75c (diff) |
x86: fix build breakage when PCI is define and PARAVIRT is not
- Fix the the build breakage when PARAVIRT is defined
but PCI is not
This fixes problem reported at:
http://marc.info/?l=linux-kernel&m=120525966600698&w=2
- Make is_vsmp_box() available even when PARAVIRT is not defined.
This is needed to determine if tsc's are reliable as a time source
even when PARAVIRT is not defined.
- split vsmp_init to use is_vsmp_box() and set_vsmp_pv_ops()
set_vsmp_pv_ops will do nothing if PCI is not enabled in the config.
Signed-off-by: Ravikiran Thirumalai <kiran@scalex86.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/apic.h')
-rw-r--r-- | include/asm-x86/apic.h | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/include/asm-x86/apic.h b/include/asm-x86/apic.h index b804238489a..b11d6524fb1 100644 --- a/include/asm-x86/apic.h +++ b/include/asm-x86/apic.h | |||
@@ -50,19 +50,16 @@ extern int disable_apic_timer; | |||
50 | */ | 50 | */ |
51 | #ifdef CONFIG_PARAVIRT | 51 | #ifdef CONFIG_PARAVIRT |
52 | #include <asm/paravirt.h> | 52 | #include <asm/paravirt.h> |
53 | extern int is_vsmp_box(void); | ||
54 | #else | 53 | #else |
55 | #define apic_write native_apic_write | 54 | #define apic_write native_apic_write |
56 | #define apic_write_atomic native_apic_write_atomic | 55 | #define apic_write_atomic native_apic_write_atomic |
57 | #define apic_read native_apic_read | 56 | #define apic_read native_apic_read |
58 | #define setup_boot_clock setup_boot_APIC_clock | 57 | #define setup_boot_clock setup_boot_APIC_clock |
59 | #define setup_secondary_clock setup_secondary_APIC_clock | 58 | #define setup_secondary_clock setup_secondary_APIC_clock |
60 | static int inline is_vsmp_box(void) | ||
61 | { | ||
62 | return 0; | ||
63 | } | ||
64 | #endif | 59 | #endif |
65 | 60 | ||
61 | extern int is_vsmp_box(void); | ||
62 | |||
66 | static inline void native_apic_write(unsigned long reg, u32 v) | 63 | static inline void native_apic_write(unsigned long reg, u32 v) |
67 | { | 64 | { |
68 | *((volatile u32 *)(APIC_BASE + reg)) = v; | 65 | *((volatile u32 *)(APIC_BASE + reg)) = v; |