OSDN Git Service

sh: fix smp-shx3 build regression from removal of arch localtimer
authorRich Felker <dalias@libc.org>
Sun, 27 Mar 2016 16:57:23 +0000 (16:57 +0000)
committerRich Felker <dalias@libc.org>
Tue, 29 Mar 2016 22:03:50 +0000 (22:03 +0000)
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>
arch/sh/include/asm/smp.h
arch/sh/kernel/cpu/sh4a/smp-shx3.c

index 1baf0ba..c9f8bbd 100644 (file)
@@ -34,11 +34,6 @@ enum {
 DECLARE_PER_CPU(int, cpu_state);
 
 void smp_message_recv(unsigned int msg);
-void smp_timer_broadcast(const struct cpumask *mask);
-
-void local_timer_interrupt(void);
-void local_timer_setup(unsigned int cpu);
-void local_timer_stop(unsigned int cpu);
 
 void arch_send_call_function_single_ipi(int cpu);
 void arch_send_call_function_ipi_mask(const struct cpumask *mask);
index 4a29880..839612c 100644 (file)
@@ -73,8 +73,6 @@ static void shx3_prepare_cpus(unsigned int max_cpus)
 {
        int i;
 
-       local_timer_setup(0);
-
        BUILD_BUG_ON(SMP_MSG_NR >= 8);
 
        for (i = 0; i < SMP_MSG_NR; i++)