9 files changed, 25 insertions, 57 deletions

diff --git a/arch/ia64/kernel/acpi.c b/arch/ia64/kernel/acpi.c
index 07d209c9507f..0d407b300762 100644
--- a/arch/ia64/kernel/acpi.c
+++ b/arch/ia64/kernel/acpi.c
@@ -54,10 +54,6 @@
 #include <asm/sal.h>
 #include <asm/cyclone.h>
 
-#define BAD_MADT_ENTRY(entry, end) (                                        \
-                (!entry) || (unsigned long)entry + sizeof(*entry) > end ||  \
-                ((struct acpi_subtable_header *)entry)->length < sizeof(*entry))
-
 #define PREFIX                  "ACPI: "
 
 unsigned int acpi_cpei_override;
@@ -803,14 +799,9 @@ int acpi_isa_irq_to_gsi(unsigned isa_irq, u32 *gsi)
  *  ACPI based hotplug CPU support
  */
 #ifdef CONFIG_ACPI_HOTPLUG_CPU
-static
-int acpi_map_cpu2node(acpi_handle handle, int cpu, int physid)
+static int acpi_map_cpu2node(acpi_handle handle, int cpu, int physid)
 {
 #ifdef CONFIG_ACPI_NUMA
-        int pxm_id;
-        int nid;
-
-        pxm_id = acpi_get_pxm(handle);
         /*
          * We don't have cpu-only-node hotadd. But if the system equips
          * SRAT table, pxm is already found and node is ready.
@@ -818,11 +809,10 @@ int acpi_map_cpu2node(acpi_handle handle, int cpu, int physid)
          * This code here is for the system which doesn't have full SRAT
          * table for possible cpus.
          */
-        nid = acpi_map_pxm_to_node(pxm_id);
         node_cpuid[cpu].phys_id = physid;
-        node_cpuid[cpu].nid = nid;
+        node_cpuid[cpu].nid = acpi_get_node(handle);
 #endif
-        return (0);
+        return 0;
 }
 
 int additional_cpus __initdata = -1;
@@ -929,7 +919,7 @@ static acpi_status acpi_map_iosapic(acpi_handle handle, u32 depth,
         union acpi_object *obj;
         struct acpi_madt_io_sapic *iosapic;
         unsigned int gsi_base;
-        int pxm, node;
+        int node;
 
         /* Only care about objects w/ a method that returns the MADT */
         if (ACPI_FAILURE(acpi_evaluate_object(handle, "_MAT", NULL, &buffer)))
@@ -956,17 +946,9 @@ static acpi_status acpi_map_iosapic(acpi_handle handle, u32 depth,
 
         kfree(buffer.pointer);
 
-        /*
-         * OK, it's an IOSAPIC MADT entry, look for a _PXM value to tell
-         * us which node to associate this with.
-         */
-        pxm = acpi_get_pxm(handle);
-        if (pxm < 0)
-                return AE_OK;
-
-        node = pxm_to_node(pxm);
-
-        if (node >= MAX_NUMNODES || !node_online(node) ||
+        /* OK, it's an IOSAPIC MADT entry; associate it with a node */
+        node = acpi_get_node(handle);
+        if (node == NUMA_NO_NODE || !node_online(node) ||
             cpumask_empty(cpumask_of_node(node)))
                 return AE_OK;
 
diff --git a/arch/ia64/kernel/efi.c b/arch/ia64/kernel/efi.c
index da5b462e6de6..741b99c1a0b1 100644
--- a/arch/ia64/kernel/efi.c
+++ b/arch/ia64/kernel/efi.c
@@ -477,6 +477,9 @@ efi_init (void)
         char *cp, vendor[100] = "unknown";
         int i;
 
+        set_bit(EFI_BOOT, &efi.flags);
+        set_bit(EFI_64BIT, &efi.flags);
+
         /*
          * It's too early to be able to use the standard kernel command line
          * support...
@@ -529,6 +532,8 @@ efi_init (void)
                efi.systab->hdr.revision >> 16,
                efi.systab->hdr.revision & 0xffff, vendor);
 
+        set_bit(EFI_SYSTEM_TABLES, &efi.flags);
+
         palo_phys      = EFI_INVALID_TABLE_ADDR;
 
         if (efi_config_init(arch_tables) != 0)
@@ -657,6 +662,8 @@ efi_enter_virtual_mode (void)
                 return;
         }
 
+        set_bit(EFI_RUNTIME_SERVICES, &efi.flags);
+
         /*
          * Now that EFI is in virtual mode, we call the EFI functions more
          * efficiently:
diff --git a/arch/ia64/kernel/ftrace.c b/arch/ia64/kernel/ftrace.c
index 7fc8c961b1f7..3b0c2aa07857 100644
--- a/arch/ia64/kernel/ftrace.c
+++ b/arch/ia64/kernel/ftrace.c
@@ -198,9 +198,7 @@ int ftrace_update_ftrace_func(ftrace_func_t func)
 }
 
 /* run from kstop_machine */
-int __init ftrace_dyn_arch_init(void *data)
+int __init ftrace_dyn_arch_init(void)
 {
-        *(unsigned long *)data = 0;
-
         return 0;
 }
diff --git a/arch/ia64/kernel/irq_ia64.c b/arch/ia64/kernel/irq_ia64.c
index 1034884b77da..0884f5ecbcc3 100644
--- a/arch/ia64/kernel/irq_ia64.c
+++ b/arch/ia64/kernel/irq_ia64.c
@@ -364,7 +364,6 @@ static irqreturn_t smp_irq_move_cleanup_interrupt(int irq, void *dev_id)
 
 static struct irqaction irq_move_irqaction = {
         .handler =      smp_irq_move_cleanup_interrupt,
-        .flags =        IRQF_DISABLED,
         .name =         "irq_move"
 };
 
@@ -489,14 +488,13 @@ ia64_handle_irq (ia64_vector vector, struct pt_regs *regs)
         ia64_srlz_d();
         while (vector != IA64_SPURIOUS_INT_VECTOR) {
                 int irq = local_vector_to_irq(vector);
-                struct irq_desc *desc = irq_to_desc(irq);
 
                 if (unlikely(IS_LOCAL_TLB_FLUSH(vector))) {
                         smp_local_flush_tlb();
-                        kstat_incr_irqs_this_cpu(irq, desc);
+                        kstat_incr_irq_this_cpu(irq);
                 } else if (unlikely(IS_RESCHEDULE(vector))) {
                         scheduler_ipi();
-                        kstat_incr_irqs_this_cpu(irq, desc);
+                        kstat_incr_irq_this_cpu(irq);
                 } else {
                         ia64_setreg(_IA64_REG_CR_TPR, vector);
                         ia64_srlz_d();
@@ -549,13 +547,12 @@ void ia64_process_pending_intr(void)
           */
         while (vector != IA64_SPURIOUS_INT_VECTOR) {
                 int irq = local_vector_to_irq(vector);
-                struct irq_desc *desc = irq_to_desc(irq);
 
                 if (unlikely(IS_LOCAL_TLB_FLUSH(vector))) {
                         smp_local_flush_tlb();
-                        kstat_incr_irqs_this_cpu(irq, desc);
+                        kstat_incr_irq_this_cpu(irq);
                 } else if (unlikely(IS_RESCHEDULE(vector))) {
-                        kstat_incr_irqs_this_cpu(irq, desc);
+                        kstat_incr_irq_this_cpu(irq);
                 } else {
                         struct pt_regs *old_regs = set_irq_regs(NULL);
 
@@ -602,7 +599,6 @@ static irqreturn_t dummy_handler (int irq, void *dev_id)
 
 static struct irqaction ipi_irqaction = {
         .handler =      handle_IPI,
-        .flags =        IRQF_DISABLED,
         .name =         "IPI"
 };
 
@@ -611,13 +607,11 @@ static struct irqaction ipi_irqaction = {
  */
 static struct irqaction resched_irqaction = {
         .handler =      dummy_handler,
-        .flags =        IRQF_DISABLED,
         .name =         "resched"
 };
 
 static struct irqaction tlb_irqaction = {
         .handler =      dummy_handler,
-        .flags =        IRQF_DISABLED,
         .name =         "tlb_flush"
 };
 
diff --git a/arch/ia64/kernel/mca.c b/arch/ia64/kernel/mca.c
index b8edfa75a83f..db7b36bb068b 100644
--- a/arch/ia64/kernel/mca.c
+++ b/arch/ia64/kernel/mca.c
@@ -217,7 +217,7 @@ void ia64_mca_printk(const char *fmt, ...)
         /* Copy the output into mlogbuf */
         if (oops_in_progress) {
                 /* mlogbuf was abandoned, use printk directly instead. */
-                printk(temp_buf);
+                printk("%s", temp_buf);
         } else {
                 spin_lock(&mlogbuf_wlock);
                 for (p = temp_buf; *p; p++) {
@@ -268,7 +268,7 @@ void ia64_mlogbuf_dump(void)
                 }
                 *p = '\0';
                 if (temp_buf[0])
-                        printk(temp_buf);
+                        printk("%s", temp_buf);
                 mlogbuf_start = index;
 
                 mlogbuf_timestamp = 0;
@@ -1772,38 +1772,32 @@ __setup("disable_cpe_poll", ia64_mca_disable_cpe_polling);
 
 static struct irqaction cmci_irqaction = {
         .handler =      ia64_mca_cmc_int_handler,
-        .flags =        IRQF_DISABLED,
         .name =         "cmc_hndlr"
 };
 
 static struct irqaction cmcp_irqaction = {
         .handler =      ia64_mca_cmc_int_caller,
-        .flags =        IRQF_DISABLED,
         .name =         "cmc_poll"
 };
 
 static struct irqaction mca_rdzv_irqaction = {
         .handler =      ia64_mca_rendez_int_handler,
-        .flags =        IRQF_DISABLED,
         .name =         "mca_rdzv"
 };
 
 static struct irqaction mca_wkup_irqaction = {
         .handler =      ia64_mca_wakeup_int_handler,
-        .flags =        IRQF_DISABLED,
         .name =         "mca_wkup"
 };
 
 #ifdef CONFIG_ACPI
 static struct irqaction mca_cpe_irqaction = {
         .handler =      ia64_mca_cpe_int_handler,
-        .flags =        IRQF_DISABLED,
         .name =         "cpe_hndlr"
 };
 
 static struct irqaction mca_cpep_irqaction = {
         .handler =      ia64_mca_cpe_int_caller,
-        .flags =        IRQF_DISABLED,
         .name =         "cpe_poll"
 };
 #endif /* CONFIG_ACPI */
diff --git a/arch/ia64/kernel/msi_ia64.c b/arch/ia64/kernel/msi_ia64.c
index fb2f1e622877..c430f9198d1b 100644
--- a/arch/ia64/kernel/msi_ia64.c
+++ b/arch/ia64/kernel/msi_ia64.c
@@ -17,12 +17,9 @@ static int ia64_set_msi_irq_affinity(struct irq_data *idata,
 {
         struct msi_msg msg;
         u32 addr, data;
-        int cpu = first_cpu(*cpu_mask);
+        int cpu = cpumask_first_and(cpu_mask, cpu_online_mask);
         unsigned int irq = idata->irq;
 
-        if (!cpu_online(cpu))
-                return -1;
-
         if (irq_prepare_move(irq, cpu))
                 return -1;
 
@@ -139,10 +136,7 @@ static int dmar_msi_set_affinity(struct irq_data *data,
         unsigned int irq = data->irq;
         struct irq_cfg *cfg = irq_cfg + irq;
         struct msi_msg msg;
-        int cpu = cpumask_first(mask);
-
-        if (!cpu_online(cpu))
-                return -1;
+        int cpu = cpumask_first_and(mask, cpu_online_mask);
 
         if (irq_prepare_move(irq, cpu))
                 return -1;
diff --git a/arch/ia64/kernel/perfmon.c b/arch/ia64/kernel/perfmon.c
index cb592773c78b..d841c4bd6864 100644
--- a/arch/ia64/kernel/perfmon.c
+++ b/arch/ia64/kernel/perfmon.c
@@ -6387,7 +6387,6 @@ pfm_flush_pmds(struct task_struct *task, pfm_context_t *ctx)
 
 static struct irqaction perfmon_irqaction = {
         .handler = pfm_interrupt_handler,
-        .flags   = IRQF_DISABLED,
         .name    = "perfmon"
 };
 
diff --git a/arch/ia64/kernel/time.c b/arch/ia64/kernel/time.c
index fbaac1afb844..71c52bc7c28d 100644
--- a/arch/ia64/kernel/time.c
+++ b/arch/ia64/kernel/time.c
@@ -380,7 +380,7 @@ static cycle_t itc_get_cycles(struct clocksource *cs)
 
 static struct irqaction timer_irqaction = {
         .handler =      timer_interrupt,
-        .flags =        IRQF_DISABLED | IRQF_IRQPOLL,
+        .flags =        IRQF_IRQPOLL,
         .name =         "timer"
 };
 
diff --git a/arch/ia64/kernel/uncached.c b/arch/ia64/kernel/uncached.c
index a96bcf83a735..20e8a9b21d75 100644
--- a/arch/ia64/kernel/uncached.c
+++ b/arch/ia64/kernel/uncached.c
@@ -98,7 +98,7 @@ static int uncached_add_chunk(struct uncached_pool *uc_pool, int nid)
         /* attempt to allocate a granule's worth of cached memory pages */
 
         page = alloc_pages_exact_node(nid,
-                                GFP_KERNEL | __GFP_ZERO | GFP_THISNODE,
+                                GFP_KERNEL | __GFP_ZERO | __GFP_THISNODE,
                                 IA64_GRANULE_SHIFT-PAGE_SHIFT);
         if (!page) {
                 mutex_unlock(&uc_pool->add_chunk_mutex);