diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2008-01-30 13:30:15 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:30:15 +0100 |
| commit | 42e0a9aa5d467188687c6b705412578e53c14af6 (patch) | |
| tree | 9c9a64a576a4072b816babf0bb81aa5924d2a667 /include/asm-x86/apic_32.h | |
| parent | 3c6bb07ac1b4174318606a26f0de8ceb9f6d8133 (diff) | |
| download | blackbird-obmc-linux-42e0a9aa5d467188687c6b705412578e53c14af6.tar.gz blackbird-obmc-linux-42e0a9aa5d467188687c6b705412578e53c14af6.zip | |
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/apic_32.h')
| -rw-r--r-- | include/asm-x86/apic_32.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/include/asm-x86/apic_32.h b/include/asm-x86/apic_32.h index f909e2daf226..649e9a6f6683 100644 --- a/include/asm-x86/apic_32.h +++ b/include/asm-x86/apic_32.h @@ -51,25 +51,23 @@ extern int local_apic_timer_disabled; #define setup_secondary_clock setup_secondary_APIC_clock #endif -static __inline fastcall void native_apic_write(unsigned long reg, - unsigned long v) +static __inline fastcall void native_apic_write(unsigned long reg, u32 v) { - *((volatile unsigned long *)(APIC_BASE+reg)) = v; + *((volatile u32 *)(APIC_BASE + reg)) = v; } -static __inline fastcall void native_apic_write_atomic(unsigned long reg, - unsigned long v) +static __inline fastcall void native_apic_write_atomic(unsigned long reg, u32 v) { - xchg((volatile unsigned long *)(APIC_BASE+reg), v); + (void) xchg((u32 *)(APIC_BASE + reg), v); } -static __inline fastcall unsigned long native_apic_read(unsigned long reg) +static __inline fastcall u32 native_apic_read(unsigned long reg) { - return *((volatile unsigned long *)(APIC_BASE+reg)); + return *((volatile u32 *)(APIC_BASE + reg)); } extern void apic_wait_icr_idle(void); -extern unsigned long safe_apic_wait_icr_idle(void); +extern u32 safe_apic_wait_icr_idle(void); extern int get_physical_broadcast(void); #ifdef CONFIG_X86_GOOD_APIC |
