Merge branch 'x86/x2apic' into x86/core

Conflicts:

	include/asm-x86/i8259.h
	include/asm-x86/msidef.h

Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --cc Documentation/kernel-parameters.txt
Simple merge

diff --cc arch/x86/Kconfig
Simple merge

diff --cc include/asm-x86/apic.h
Simple merge

diff --cc include/asm-x86/apicdef.h
Simple merge

diff --cc include/asm-x86/cpufeature.h
Simple merge

diff --cc include/asm-x86/genapic_64.h
Simple merge

diff --cc include/asm-x86/hw_irq.h
Simple merge

diff --cc include/asm-x86/i8259.h
index c586559,31112b6..23c1b3b
--- 1/include/asm-x86/i8259.h
--- 2/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;
  
 -#endif        /* __ASM_I8259_H__ */
+ extern void mask_8259A(void);
+ extern void unmask_8259A(void);
+ 
 +#endif /* ASM_X86__I8259_H */

diff --cc include/asm-x86/io_apic.h
Simple merge

diff --cc include/asm-x86/ipi.h
Simple merge

diff --cc include/asm-x86/mach-default/mach_apic.h
Simple merge

diff --cc include/asm-x86/mach-default/mach_apicdef.h
Simple merge

diff --cc include/asm-x86/mach-es7000/mach_apic.h
Simple merge

diff --cc include/asm-x86/msidef.h
index 3139666,57fd859..ed91902
--- 1/include/asm-x86/msidef.h
--- 2/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)
  
 -#endif /* ASM_MSIDEF_H */
+ #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_X86__MSIDEF_H */

diff --cc include/asm-x86/paravirt.h
Simple merge

diff --cc include/asm-x86/smp.h
Simple merge

diff --cc kernel/irq/manage.c
Simple merge