Merge branches 'x86/apic', 'x86/cleanups' and 'x86/mm' into x86/core

diff --combined arch/x86/kernel/apic/io_apic.c
index d990408ca06f10ad33a85dbc2c09af59fc66566d,55e8f851f711f24acf1b0bafd60e04dad2ab9016,86827d85488a7cd4d8317d611eaa2c789776e046..da99ffcdfde62a006bcbcf84a496c4f4ea8de755
--- 1/arch/x86/kernel/apic/io_apic.c
--- 2/arch/x86/kernel/apic/io_apic.c
--- 3/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@@@ -592,12 -592,10 -592,10 +592,12 @@@@ set_desc_affinity(struct irq_desc *desc
        if (assign_irq_vector(irq, cfg, mask))
                return BAD_APICID;
   
 --     cpumask_and(desc->affinity, cfg->domain, mask);
 ++     /* check that before desc->addinity get updated */
        set_extra_move_desc(desc, mask);
   
 --     return apic->cpu_mask_to_apicid_and(desc->affinity, cpu_online_mask);
 ++     cpumask_copy(desc->affinity, mask);
 ++
 ++     return apic->cpu_mask_to_apicid_and(desc->affinity, cfg->domain);
   }
   
   static void
@@@@ -1430,7 -1428,6 -1428,7 +1430,6 @@@@ void __setup_vector_irq(int cpu
   
   static struct irq_chip ioapic_chip;
   static struct irq_chip ir_ioapic_chip;
- -static struct irq_chip msi_ir_chip;
   
   #define IOAPIC_AUTO     -1
   #define IOAPIC_EDGE     0
@@@@ -2665,20 -2662,20 -2663,20 +2664,20 @@@@ static struct irq_chip ioapic_chip __re
        .retrigger      = ioapic_retrigger_irq,
   };
   
- -#ifdef CONFIG_INTR_REMAP
   static struct irq_chip ir_ioapic_chip __read_mostly = {
        .name           = "IR-IO-APIC",
        .startup        = startup_ioapic_irq,
        .mask           = mask_IO_APIC_irq,
        .unmask         = unmask_IO_APIC_irq,
+ +#ifdef CONFIG_INTR_REMAP
        .ack            = ack_x2apic_edge,
        .eoi            = ack_x2apic_level,
   #ifdef CONFIG_SMP
        .set_affinity   = set_ir_ioapic_affinity_irq,
+ +#endif
   #endif
        .retrigger      = ioapic_retrigger_irq,
   };
- -#endif
   
   static inline void init_IO_APIC_traps(void)
   {
@@@@ -3393,18 -3390,18 -3391,18 +3392,18 @@@@ static struct irq_chip msi_chip = 
        .retrigger      = ioapic_retrigger_irq,
   };
   
- -#ifdef CONFIG_INTR_REMAP
   static struct irq_chip msi_ir_chip = {
        .name           = "IR-PCI-MSI",
        .unmask         = unmask_msi_irq,
        .mask           = mask_msi_irq,
+ +#ifdef CONFIG_INTR_REMAP
        .ack            = ack_x2apic_edge,
   #ifdef CONFIG_SMP
        .set_affinity   = ir_set_msi_irq_affinity,
+ +#endif
   #endif
        .retrigger      = ioapic_retrigger_irq,
   };
- -#endif
   
   /*
    * Map the PCI dev to the corresponding remapping hardware unit