diff options
| author | Tony Luck <tony.luck@intel.com> | 2007-07-19 16:34:40 -0700 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2007-07-19 16:34:40 -0700 |
| commit | f4fbfb0dda5577075a049eec7fb7ad38abca1912 (patch) | |
| tree | dfba29efc83cb7c7e4f8e681152c92ee2a32fe9c /include/asm-ia64/iosapic.h | |
| parent | ffc720409ae8d1cb16ae4b9c39e9e744e4c59898 (diff) | |
| parent | bf903d0a4503db8ac166ca6135a59bc5f9b91a45 (diff) | |
Pull vector-domain into release branch
Diffstat (limited to 'include/asm-ia64/iosapic.h')
| -rw-r--r-- | include/asm-ia64/iosapic.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/asm-ia64/iosapic.h b/include/asm-ia64/iosapic.h index 421cb6b62a7..b8f71285914 100644 --- a/include/asm-ia64/iosapic.h +++ b/include/asm-ia64/iosapic.h @@ -47,19 +47,21 @@ #define IOSAPIC_MASK_SHIFT 16 #define IOSAPIC_MASK (1<<IOSAPIC_MASK_SHIFT) +#define IOSAPIC_VECTOR_MASK 0xffffff00 + #ifndef __ASSEMBLY__ #ifdef CONFIG_IOSAPIC #define NR_IOSAPICS 256 -static inline unsigned int iosapic_read(char __iomem *iosapic, unsigned int reg) +static inline unsigned int __iosapic_read(char __iomem *iosapic, unsigned int reg) { writel(reg, iosapic + IOSAPIC_REG_SELECT); return readl(iosapic + IOSAPIC_WINDOW); } -static inline void iosapic_write(char __iomem *iosapic, unsigned int reg, u32 val) +static inline void __iosapic_write(char __iomem *iosapic, unsigned int reg, u32 val) { writel(reg, iosapic + IOSAPIC_REG_SELECT); writel(val, iosapic + IOSAPIC_WINDOW); |