diff options
author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-07-14 01:19:35 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-14 03:02:54 -0400 |
commit | 94a8c3c2437c8946f1b6c8e0b2c560a7db8ed3c6 (patch) | |
tree | 7bad615005b6047306336e8f688edcf1c6bb74dd /include/asm-x86/paravirt.h | |
parent | f910a9dc7c865896815e2a95fe33363e9522f277 (diff) |
x86: let 32bit use apic_ops too - fix
fix for pv - clean up the namespace there too.
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Cc: Suresh Siddha <suresh.b.siddha@intel.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/paravirt.h')
-rw-r--r-- | include/asm-x86/paravirt.h | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/include/asm-x86/paravirt.h b/include/asm-x86/paravirt.h index 5e34d26aa3b5..08f89e385a92 100644 --- a/include/asm-x86/paravirt.h +++ b/include/asm-x86/paravirt.h | |||
@@ -200,15 +200,6 @@ struct pv_irq_ops { | |||
200 | 200 | ||
201 | struct pv_apic_ops { | 201 | struct pv_apic_ops { |
202 | #ifdef CONFIG_X86_LOCAL_APIC | 202 | #ifdef CONFIG_X86_LOCAL_APIC |
203 | #ifndef CONFIG_X86_64 | ||
204 | /* | ||
205 | * Direct APIC operations, principally for VMI. Ideally | ||
206 | * these shouldn't be in this interface. | ||
207 | */ | ||
208 | void (*apic_write)(u32 reg, u32 v); | ||
209 | void (*apic_write_atomic)(u32 reg, u32 v); | ||
210 | u32 (*apic_read)(u32 reg); | ||
211 | #endif | ||
212 | void (*setup_boot_clock)(void); | 203 | void (*setup_boot_clock)(void); |
213 | void (*setup_secondary_clock)(void); | 204 | void (*setup_secondary_clock)(void); |
214 | 205 | ||
@@ -890,26 +881,6 @@ static inline void slow_down_io(void) | |||
890 | } | 881 | } |
891 | 882 | ||
892 | #ifdef CONFIG_X86_LOCAL_APIC | 883 | #ifdef CONFIG_X86_LOCAL_APIC |
893 | /* | ||
894 | * Basic functions accessing APICs. | ||
895 | */ | ||
896 | #ifndef CONFIG_X86_64 | ||
897 | static inline void apic_write(u32 reg, u32 v) | ||
898 | { | ||
899 | PVOP_VCALL2(pv_apic_ops.apic_write, reg, v); | ||
900 | } | ||
901 | |||
902 | static inline void apic_write_atomic(u32 reg, u32 v) | ||
903 | { | ||
904 | PVOP_VCALL2(pv_apic_ops.apic_write_atomic, reg, v); | ||
905 | } | ||
906 | |||
907 | static inline u32 apic_read(u32 reg) | ||
908 | { | ||
909 | return PVOP_CALL1(unsigned long, pv_apic_ops.apic_read, reg); | ||
910 | } | ||
911 | #endif | ||
912 | |||
913 | static inline void setup_boot_clock(void) | 884 | static inline void setup_boot_clock(void) |
914 | { | 885 | { |
915 | PVOP_VCALL0(pv_apic_ops.setup_boot_clock); | 886 | PVOP_VCALL0(pv_apic_ops.setup_boot_clock); |