From: Ingo Molnar Date: Sat, 26 Jul 2008 14:29:23 +0000 (+0200) Subject: Merge branch 'x86/x2apic' into x86/core X-Git-Tag: v2.6.28-rc1~699^2^8~23^2~9 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=6dec3a10a7a6093af10cef7ac56021150afd6451;p=karo-tx-linux.git Merge branch 'x86/x2apic' into x86/core Conflicts: include/asm-x86/i8259.h include/asm-x86/msidef.h Signed-off-by: Ingo Molnar --- 6dec3a10a7a6093af10cef7ac56021150afd6451 diff --cc include/asm-x86/i8259.h index c586559a6957,31112b6c595b..23c1b3baaecd --- a/include/asm-x86/i8259.h +++ b/include/asm-x86/i8259.h @@@ -57,4 -57,7 +57,7 @@@ static inline void outb_pic(unsigned ch extern struct irq_chip i8259A_chip; + extern void mask_8259A(void); + extern void unmask_8259A(void); + -#endif /* __ASM_I8259_H__ */ +#endif /* ASM_X86__I8259_H */ diff --cc include/asm-x86/msidef.h index 3139666a94fa,57fd85935e5a..ed9190246876 --- a/include/asm-x86/msidef.h +++ b/include/asm-x86/msidef.h @@@ -48,4 -48,8 +48,8 @@@ #define MSI_ADDR_DEST_ID(dest) (((dest) << MSI_ADDR_DEST_ID_SHIFT) & \ MSI_ADDR_DEST_ID_MASK) + #define MSI_ADDR_IR_EXT_INT (1 << 4) + #define MSI_ADDR_IR_SHV (1 << 3) + #define MSI_ADDR_IR_INDEX1(index) ((index & 0x8000) >> 13) + #define MSI_ADDR_IR_INDEX2(index) ((index & 0x7fff) << 5) -#endif /* ASM_MSIDEF_H */ +#endif /* ASM_X86__MSIDEF_H */