3 files changed, 11 insertions, 5 deletions

diff --git a/arch/i386/kernel/acpi/cstate.c b/arch/i386/kernel/acpi/cstate.c
index 12e937c1ce4b..2d39f55d29a8 100644
--- a/arch/i386/kernel/acpi/cstate.c
+++ b/arch/i386/kernel/acpi/cstate.c
@@ -47,13 +47,13 @@ EXPORT_SYMBOL(acpi_processor_power_init_bm_check);
 
 /* The code below handles cstate entry with monitor-mwait pair on Intel*/
 
-struct cstate_entry_s {
+struct cstate_entry {
         struct {
                 unsigned int eax;
                 unsigned int ecx;
         } states[ACPI_PROCESSOR_MAX_POWER];
 };
-static struct cstate_entry_s *cpu_cstate_entry; /* per CPU ptr */
+static struct cstate_entry *cpu_cstate_entry;   /* per CPU ptr */
 
 static short mwait_supported[ACPI_PROCESSOR_MAX_POWER];
 
@@ -71,7 +71,7 @@ static short mwait_supported[ACPI_PROCESSOR_MAX_POWER];
 int acpi_processor_ffh_cstate_probe(unsigned int cpu,
                 struct acpi_processor_cx *cx, struct acpi_power_register *reg)
 {
-        struct cstate_entry_s *percpu_entry;
+        struct cstate_entry *percpu_entry;
         struct cpuinfo_x86 *c = cpu_data + cpu;
 
         cpumask_t saved_mask;
@@ -136,7 +136,7 @@ EXPORT_SYMBOL_GPL(acpi_processor_ffh_cstate_probe);
 void acpi_processor_ffh_cstate_enter(struct acpi_processor_cx *cx)
 {
         unsigned int cpu = smp_processor_id();
-        struct cstate_entry_s *percpu_entry;
+        struct cstate_entry *percpu_entry;
 
         percpu_entry = per_cpu_ptr(cpu_cstate_entry, cpu);
         mwait_idle_with_hints(percpu_entry->states[cx->index].eax,
@@ -150,7 +150,7 @@ static int __init ffh_cstate_init(void)
         if (c->x86_vendor != X86_VENDOR_INTEL)
                 return -1;
 
-        cpu_cstate_entry = alloc_percpu(struct cstate_entry_s);
+        cpu_cstate_entry = alloc_percpu(struct cstate_entry);
         return 0;
 }
 
diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index 73ef4a85b861..ef2fe474f107 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -590,6 +590,9 @@ void __init acpi_numa_arch_fixup(void)
  */
 int acpi_register_gsi(u32 gsi, int triggering, int polarity)
 {
+        if (acpi_irq_model == ACPI_IRQ_MODEL_PLATFORM)
+                return gsi;
+
         if (has_8259 && gsi < 16)
                 return isa_irq_to_vector(gsi);
 
diff --git a/arch/ia64/sn/kernel/io_acpi_init.c b/arch/ia64/sn/kernel/io_acpi_init.c
index 99d7f278612a..cb96b4ea7df6 100644
--- a/arch/ia64/sn/kernel/io_acpi_init.c
+++ b/arch/ia64/sn/kernel/io_acpi_init.c
@@ -223,6 +223,9 @@ sn_io_acpi_init(void)
         u64 result;
         s64 status;
 
+        /* SN Altix does not follow the IOSAPIC IRQ routing model */
+        acpi_irq_model = ACPI_IRQ_MODEL_PLATFORM;
+
         acpi_bus_register_driver(&acpi_sn_hubdev_driver);
         status = sal_ioif_init(&result);
         if (status || result)