aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorGeert Uytterhoeven <geert@linux-m68k.org>2014-10-13 18:55:41 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2014-10-13 20:18:28 -0400
commit4c6327dfaf20d6207efa765320748fd8699f74b0 (patch)
tree35fa1c118405a4d7789c6cd9c9d40c855abdcef3 /arch
parentbd6aa7e51aea1bf58c4a917630dae31def11bd2d (diff)
ia64: remove duplicate declarations of __per_cpu_start[] and __per_cpu_end[]
They're already provided by <asm/sections.h>. Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org> Cc: "Luck, Tony" <tony.luck@intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/ia64/include/asm/sections.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/sections.h b/arch/ia64/include/asm/sections.h
index 1a873b36a4a1..2ab2003698ef 100644
--- a/arch/ia64/include/asm/sections.h
+++ b/arch/ia64/include/asm/sections.h
@@ -10,7 +10,7 @@
10#include <linux/uaccess.h> 10#include <linux/uaccess.h>
11#include <asm-generic/sections.h> 11#include <asm-generic/sections.h>
12 12
13extern char __per_cpu_start[], __per_cpu_end[], __phys_per_cpu_start[]; 13extern char __phys_per_cpu_start[];
14#ifdef CONFIG_SMP 14#ifdef CONFIG_SMP
15extern char __cpu0_per_cpu[]; 15extern char __cpu0_per_cpu[];
16#endif 16#endif