aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRich Felker <dalias@libc.org>2016-03-27 12:57:23 -0400
committerRich Felker <dalias@libc.org>2016-03-29 18:03:50 -0400
commitef21b32a60fbfdf2370465e52036c1c5ed1f6b43 (patch)
tree45954285c707253e14020a510a22d88dbf893d65
parent16b02d711f4059b8338ef967064195b47cae65ea (diff)
sh: fix smp-shx3 build regression from removal of arch localtimer
The removal was not complete and left behind one reference to a removed function in smp-shx3.c. For completeness, also remove declarations for functions that were removed. Fixes: 45624ac38926 "sh: remove arch-specific localtimer and use generic one" Reported-by: Geert Uytterhoeven <geert@linux-m68k.org> Signed-off-by: Rich Felker <dalias@libc.org>
-rw-r--r--arch/sh/include/asm/smp.h5
-rw-r--r--arch/sh/kernel/cpu/sh4a/smp-shx3.c2
2 files changed, 0 insertions, 7 deletions
diff --git a/arch/sh/include/asm/smp.h b/arch/sh/include/asm/smp.h
index 1baf0ba96242..c9f8bbdb1bf8 100644
--- a/arch/sh/include/asm/smp.h
+++ b/arch/sh/include/asm/smp.h
@@ -34,11 +34,6 @@ enum {
34DECLARE_PER_CPU(int, cpu_state); 34DECLARE_PER_CPU(int, cpu_state);
35 35
36void smp_message_recv(unsigned int msg); 36void smp_message_recv(unsigned int msg);
37void smp_timer_broadcast(const struct cpumask *mask);
38
39void local_timer_interrupt(void);
40void local_timer_setup(unsigned int cpu);
41void local_timer_stop(unsigned int cpu);
42 37
43void arch_send_call_function_single_ipi(int cpu); 38void arch_send_call_function_single_ipi(int cpu);
44void arch_send_call_function_ipi_mask(const struct cpumask *mask); 39void arch_send_call_function_ipi_mask(const struct cpumask *mask);
diff --git a/arch/sh/kernel/cpu/sh4a/smp-shx3.c b/arch/sh/kernel/cpu/sh4a/smp-shx3.c
index 4a298808789c..839612c8a0a0 100644
--- a/arch/sh/kernel/cpu/sh4a/smp-shx3.c
+++ b/arch/sh/kernel/cpu/sh4a/smp-shx3.c
@@ -73,8 +73,6 @@ static void shx3_prepare_cpus(unsigned int max_cpus)
73{ 73{
74 int i; 74 int i;
75 75
76 local_timer_setup(0);
77
78 BUILD_BUG_ON(SMP_MSG_NR >= 8); 76 BUILD_BUG_ON(SMP_MSG_NR >= 8);
79 77
80 for (i = 0; i < SMP_MSG_NR; i++) 78 for (i = 0; i < SMP_MSG_NR; i++)