diff options
author | Jeremy Fitzhardinge <jeremy@goop.org> | 2009-02-09 21:05:47 +0100 |
---|---|---|
committer | Jeremy Fitzhardinge <jeremy@goop.org> | 2009-02-09 23:04:14 +0100 |
commit | 3c552ac8a747d6c26d13302c54d71dae9f56f4ac (patch) | |
tree | 6c2f48e7712704890c16092439adc915bd6b29ec /arch/x86/include/asm/apic.h | |
parent | xen: explicitly initialise the cpu field of irq_info (diff) | |
download | linux-3c552ac8a747d6c26d13302c54d71dae9f56f4ac.tar.xz linux-3c552ac8a747d6c26d13302c54d71dae9f56f4ac.zip |
x86: make apic_* operations inline functions
Mainly to get proper type-checking and consistency.
Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Diffstat (limited to 'arch/x86/include/asm/apic.h')
-rw-r--r-- | arch/x86/include/asm/apic.h | 35 |
1 files changed, 29 insertions, 6 deletions
diff --git a/arch/x86/include/asm/apic.h b/arch/x86/include/asm/apic.h index b03711d7990b..f4835a1be360 100644 --- a/arch/x86/include/asm/apic.h +++ b/arch/x86/include/asm/apic.h @@ -139,12 +139,35 @@ struct apic_ops { extern struct apic_ops *apic_ops; -#define apic_read (apic_ops->read) -#define apic_write (apic_ops->write) -#define apic_icr_read (apic_ops->icr_read) -#define apic_icr_write (apic_ops->icr_write) -#define apic_wait_icr_idle (apic_ops->wait_icr_idle) -#define safe_apic_wait_icr_idle (apic_ops->safe_wait_icr_idle) +static inline u32 apic_read(u32 reg) +{ + return apic_ops->read(reg); +} + +static inline void apic_write(u32 reg, u32 val) +{ + apic_ops->write(reg, val); +} + +static inline u64 apic_icr_read(void) +{ + return apic_ops->icr_read(); +} + +static inline void apic_icr_write(u32 low, u32 high) +{ + apic_ops->icr_write(low, high); +} + +static inline void apic_wait_icr_idle(void) +{ + apic_ops->wait_icr_idle(); +} + +static inline u32 safe_apic_wait_icr_idle(void) +{ + return apic_ops->safe_wait_icr_idle(); +} extern int get_physical_broadcast(void); |