commit 722e6f500ac72d0d43955710738a24fd957607a4
author Tony Luck <tony.luck@intel.com> Tue Sep 24 11:45:34 2019 -0700
committer Linus Torvalds <torvalds@linux-foundation.org> Tue Sep 24 12:29:16 2019 -0700
tree f2eb6739c67373d346e27fc4dde439a3a373483d
parent 4c07e2ddab5b6b57dbcb09aedbda1f484d5940cc

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>

arch/ia64/mm/discontig.c

diff --git a/arch/ia64/mm/discontig.c b/arch/ia64/mm/discontig.c
index 219fc64..4f33f6e 100644
--- 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)