diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2008-01-30 07:30:15 -0500 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 07:30:15 -0500 |
commit | 42e0a9aa5d467188687c6b705412578e53c14af6 (patch) | |
tree | 9c9a64a576a4072b816babf0bb81aa5924d2a667 /include/asm-x86/paravirt.h | |
parent | 3c6bb07ac1b4174318606a26f0de8ceb9f6d8133 (diff) |
x86: use u32 for some lapic functions
Use u32 so 32 and 64bit have the same interface.
Andrew Morton: xen, lguest build fixes
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/paravirt.h')
-rw-r--r-- | include/asm-x86/paravirt.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/include/asm-x86/paravirt.h b/include/asm-x86/paravirt.h index f59d370c5df4..19fd3e67b08c 100644 --- a/include/asm-x86/paravirt.h +++ b/include/asm-x86/paravirt.h | |||
@@ -150,9 +150,9 @@ struct pv_apic_ops { | |||
150 | * Direct APIC operations, principally for VMI. Ideally | 150 | * Direct APIC operations, principally for VMI. Ideally |
151 | * these shouldn't be in this interface. | 151 | * these shouldn't be in this interface. |
152 | */ | 152 | */ |
153 | void (*apic_write)(unsigned long reg, unsigned long v); | 153 | void (*apic_write)(unsigned long reg, u32 v); |
154 | void (*apic_write_atomic)(unsigned long reg, unsigned long v); | 154 | void (*apic_write_atomic)(unsigned long reg, u32 v); |
155 | unsigned long (*apic_read)(unsigned long reg); | 155 | u32 (*apic_read)(unsigned long reg); |
156 | void (*setup_boot_clock)(void); | 156 | void (*setup_boot_clock)(void); |
157 | void (*setup_secondary_clock)(void); | 157 | void (*setup_secondary_clock)(void); |
158 | 158 | ||
@@ -690,17 +690,17 @@ static inline void slow_down_io(void) { | |||
690 | /* | 690 | /* |
691 | * Basic functions accessing APICs. | 691 | * Basic functions accessing APICs. |
692 | */ | 692 | */ |
693 | static inline void apic_write(unsigned long reg, unsigned long v) | 693 | static inline void apic_write(unsigned long reg, u32 v) |
694 | { | 694 | { |
695 | PVOP_VCALL2(pv_apic_ops.apic_write, reg, v); | 695 | PVOP_VCALL2(pv_apic_ops.apic_write, reg, v); |
696 | } | 696 | } |
697 | 697 | ||
698 | static inline void apic_write_atomic(unsigned long reg, unsigned long v) | 698 | static inline void apic_write_atomic(unsigned long reg, u32 v) |
699 | { | 699 | { |
700 | PVOP_VCALL2(pv_apic_ops.apic_write_atomic, reg, v); | 700 | PVOP_VCALL2(pv_apic_ops.apic_write_atomic, reg, v); |
701 | } | 701 | } |
702 | 702 | ||
703 | static inline unsigned long apic_read(unsigned long reg) | 703 | static inline u32 apic_read(unsigned long reg) |
704 | { | 704 | { |
705 | return PVOP_CALL1(unsigned long, pv_apic_ops.apic_read, reg); | 705 | return PVOP_CALL1(unsigned long, pv_apic_ops.apic_read, reg); |
706 | } | 706 | } |