Merge tag 'v4.0-rc2' into irq/core, to refresh the tree before applying new changes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 9 insertions, 14 deletions

diff --git a/arch/x86/kernel/acpi/boot.c b/arch/x86/kernel/acpi/boot.c
index b9e30daa0881..3d525c6124f6 100644
--- a/arch/x86/kernel/acpi/boot.c
+++ b/arch/x86/kernel/acpi/boot.c
@@ -613,6 +613,11 @@ int acpi_gsi_to_irq(u32 gsi, unsigned int *irqp)
 {
         int rc, irq, trigger, polarity;
 
+        if (acpi_irq_model == ACPI_IRQ_MODEL_PIC) {
+                *irqp = gsi;
+                return 0;
+        }
+
         rc = acpi_get_override_irq(gsi, &trigger, &polarity);
         if (rc == 0) {
                 trigger = trigger ? ACPI_LEVEL_SENSITIVE : ACPI_EDGE_SENSITIVE;
@@ -653,6 +658,7 @@ static int acpi_register_gsi_pic(struct device *dev, u32 gsi,
         return gsi;
 }
 
+#ifdef CONFIG_X86_LOCAL_APIC
 static int acpi_register_gsi_ioapic(struct device *dev, u32 gsi,
                                     int trigger, int polarity)
 {
@@ -675,6 +681,7 @@ static void acpi_unregister_gsi_ioapic(u32 gsi)
         mutex_unlock(&acpi_ioapic_lock);
 #endif
 }
+#endif
 
 int (*__acpi_register_gsi)(struct device *dev, u32 gsi,
                            int trigger, int polarity) = acpi_register_gsi_pic;
@@ -843,13 +850,7 @@ int acpi_ioapic_registered(acpi_handle handle, u32 gsi_base)
 
 static int __init acpi_parse_sbf(struct acpi_table_header *table)
 {
-        struct acpi_table_boot *sb;
-
-        sb = (struct acpi_table_boot *)table;
-        if (!sb) {
-                printk(KERN_WARNING PREFIX "Unable to map SBF\n");
-                return -ENODEV;
-        }
+        struct acpi_table_boot *sb = (struct acpi_table_boot *)table;
 
         sbf_port = sb->cmos_index;      /* Save CMOS port */
 
@@ -863,13 +864,7 @@ static struct resource *hpet_res __initdata;
 
 static int __init acpi_parse_hpet(struct acpi_table_header *table)
 {
-        struct acpi_table_hpet *hpet_tbl;
-
-        hpet_tbl = (struct acpi_table_hpet *)table;
-        if (!hpet_tbl) {
-                printk(KERN_WARNING PREFIX "Unable to map HPET\n");
-                return -ENODEV;
-        }
+        struct acpi_table_hpet *hpet_tbl = (struct acpi_table_hpet *)table;
 
         if (hpet_tbl->address.space_id != ACPI_SPACE_MEM) {
                 printk(KERN_WARNING PREFIX "HPET timers must be located in "