ia64: Fix some warnings introduced in merge window

Fix

  arch/ia64/kernel/irq_ia64.c:586:1: warning: no return statement in function returning non-void [-Wreturn-type]
  arch/ia64/mm/contig.c:111:6: warning: unused variable 'rc' [-Wunused-variable]
  arch/ia64/mm/discontig.c:189:39: warning: unused variable 'rc' [-Wunused-variable]

Signed-off-by: Tony Luck <tony.luck@intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/ia64/kernel/irq_ia64.c b/arch/ia64/kernel/irq_ia64.c
index f1020847813177673fbe0f5ddc92db1e43747ded..8e91c86e8072c37cc785ef781b185c084c311454 100644 (file)
--- a/arch/ia64/kernel/irq_ia64.c
+++ b/arch/ia64/kernel/irq_ia64.c
@@ -583,6 +583,7 @@ void ia64_process_pending_intr(void)
 static irqreturn_t dummy_handler (int irq, void *dev_id)
 {
        BUG();
+       return IRQ_NONE;
 }
 
 static struct irqaction ipi_irqaction = {

diff --git a/arch/ia64/mm/contig.c b/arch/ia64/mm/contig.c
index db09a693f0941dba95f02da4aeff80792464372f..5b00dc3898e19b12cfb0ace59dd0866caeb06f2d 100644 (file)
--- a/arch/ia64/mm/contig.c
+++ b/arch/ia64/mm/contig.c
@@ -108,7 +108,6 @@ setup_per_cpu_areas(void)
        struct pcpu_group_info *gi;
        unsigned int cpu;
        ssize_t static_size, reserved_size, dyn_size;
-       int rc;
 
        ai = pcpu_alloc_alloc_info(1, num_possible_cpus());
        if (!ai)

diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c
index 219fc640414bfe819260540ec5f401eb9d5ad099..4f33f6e7e2065a8f0c70ef5476c6b6bdb62c17e2 100644 (file)
--- a/arch/ia64/mm/discontig.c
+++ b/arch/ia64/mm/discontig.c
@@ -186,7 +186,7 @@ void __init setup_per_cpu_areas(void)
        unsigned long base_offset;
        unsigned int cpu;
        ssize_t static_size, reserved_size, dyn_size;
-       int node, prev_node, unit, nr_units, rc;
+       int node, prev_node, unit, nr_units;
 
        ai = pcpu_alloc_alloc_info(MAX_NUMNODES, nr_cpu_ids);
        if (!ai)