diff mbox

sh: fix smp-shx3 build regression from removal of arch localtimer

Message ID 20160327170313.GZ21636@brightrain.aerifal.cx
State New
Headers show

Commit Message

Rich Felker March 27, 2016, 5:03 p.m. UTC
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          | 5 -----
 arch/sh/kernel/cpu/sh4a/smp-shx3.c | 2 --
 2 files changed, 7 deletions(-)

Comments

Rob Landley March 29, 2016, 6:18 p.m. UTC | #1
On 03/27/2016 12:03 PM, Rich Felker wrote:
> 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>

This is a bugfix during the rc1->rc2 window, as a maintainer you should
probably cc: Linus on this. (With a reference to the bug report email,
either by making it a reply to that message or by adding a URL to a web
archive, in this case
http://lkml.iu.edu/hypermail/linux/kernel/1603.3/01275.html.)

You tested the fix, if it needs another fix it's early enough to add
another patch on top of it. For right now the priority's unbreaking
people's builds.

Rob
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Rich Felker March 29, 2016, 8:07 p.m. UTC | #2
On Tue, Mar 29, 2016 at 01:18:57PM -0500, Rob Landley wrote:
> On 03/27/2016 12:03 PM, Rich Felker wrote:
> > 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>
> 
> This is a bugfix during the rc1->rc2 window, as a maintainer you should
> probably cc: Linus on this. (With a reference to the bug report email,
> either by making it a reply to that message or by adding a URL to a web
> archive, in this case
> http://lkml.iu.edu/hypermail/linux/kernel/1603.3/01275.html.)
> 
> You tested the fix, if it needs another fix it's early enough to add
> another patch on top of it. For right now the priority's unbreaking
> people's builds.

Yes, if there are no comments indicating that it needs changes, I'll
send another pull request to Linus and link to the report of the build
regression. This is the whole point of having rc's, right? :)

Rich
--
To unsubscribe from this list: send the line "unsubscribe linux-sh" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/arch/sh/include/asm/smp.h b/arch/sh/include/asm/smp.h
index 1baf0ba..c9f8bbd 100644
--- a/arch/sh/include/asm/smp.h
+++ b/arch/sh/include/asm/smp.h
@@ -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);
diff --git a/arch/sh/kernel/cpu/sh4a/smp-shx3.c b/arch/sh/kernel/cpu/sh4a/smp-shx3.c
index 4a29880..839612c 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)
 {
 	int i;
 
-	local_timer_setup(0);
-
 	BUILD_BUG_ON(SMP_MSG_NR >= 8);
 
 	for (i = 0; i < SMP_MSG_NR; i++)