Merge branch 'x86/core' of git://git.kernel.org/pub/scm/linux/kernel/git/jaswinder...

diff --combined arch/x86/kernel/apic/io_apic.c
index 86827d85488a7cd4d8317d611eaa2c789776e046,d36e3d8be0f1772d7edfe5585e0003072880d955..55e8f851f711f24acf1b0bafd60e04dad2ab9016
--- 1/arch/x86/kernel/apic/io_apic.c
--- 2/arch/x86/kernel/apic/io_apic.c
+++ b/arch/x86/kernel/apic/io_apic.c
@@@ -1428,7 -1428,6 +1428,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
@@@ -2663,20 -2662,20 +2662,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)
  {
@@@ -3391,18 -3390,18 +3390,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
@@@ -3464,7 -3463,7 +3463,7 @@@ int arch_setup_msi_irqs(struct pci_dev 
        int ret, sub_handle;
        struct msi_desc *msidesc;
        unsigned int irq_want;
 -      struct intel_iommu *iommu = 0;
 +      struct intel_iommu *iommu = NULL;
        int index = 0;
  
        irq_want = nr_irqs_gsi;
@@@ -3599,7 -3598,7 +3598,7 @@@ static void hpet_msi_set_affinity(unsig
  
  #endif /* CONFIG_SMP */
  
 -struct irq_chip hpet_msi_type = {
 +static struct irq_chip hpet_msi_type = {
        .name = "HPET_MSI",
        .unmask = hpet_msi_unmask,
        .mask = hpet_msi_mask,
@@@ -4130,12 -4129,9 +4129,12 @@@ static int __init ioapic_insert_resourc
        struct resource *r = ioapic_resources;
  
        if (!r) {
 -              printk(KERN_ERR
 -                     "IO APIC resources could be not be allocated.\n");
 -              return -1;
 +              if (nr_ioapics > 0) {
 +                      printk(KERN_ERR
 +                              "IO APIC resources couldn't be allocated.\n");
 +                      return -1;
 +              }
 +              return 0;
        }
  
        for (i = 0; i < nr_ioapics; i++) {