HACK: ARM: Fix generic timer broadcast for TWD

Commit Message

Mark Rutland Feb. 12, 2013, 5:12 p.m. UTC

[...]

> So, things to be done here:
> 1. Fix the #else part of the code.
> 2. Fix the reported oops.

I believe the patch below solves point 1. Nothing refers to smp_timer_broadcast
any more (as I've tested with git grep), so removing it shouldn't create any
additional problems.

Russell, are you happy for me to drop this in the patch system?

Thanks,
Mark.

---->8----
From 1954a075d0ce7f5ce5466b20f7aee9a0ac044cda Mon Sep 17 00:00:00 2001
From: Mark Rutland <[e-mail]>
Date: Tue, 12 Feb 2013 16:50:18 +0000
Subject: [PATCH] arm: remove unused smp_timer_broadcast #define

The assignment of clock_event_device::broadcast can be done by timer
core as of 12ad100046: "clockevents: Add generic timer broadcast
function", and the arm code moved over to this as of 3d06770eef: "arm:
Add generic timer broadcast support", but left a dangling #define when
!CONFIG_GENERIC_TIMER_BROADCAST.

This patch removes the now unused #define.

Signed-off-by: Mark Rutland <[e-mail]>
---
 arch/arm/kernel/smp.c | 2 --
 1 file changed, 2 deletions(-)

Comments

Russell King - ARM Linux Feb. 12, 2013, 5:15 p.m. UTC | #1

On Tue, Feb 12, 2013 at 05:12:17PM +0000, Mark Rutland wrote:
> [...]
> 
> > So, things to be done here:
> > 1. Fix the #else part of the code.
> > 2. Fix the reported oops.
> 
> I believe the patch below solves point 1. Nothing refers to smp_timer_broadcast
> any more (as I've tested with git grep), so removing it shouldn't create any
> additional problems.
> 
> Russell, are you happy for me to drop this in the patch system?

Yes, it might as well go into the devel-stable branch along with your
other patches.  Thanks.

Mark Rutland Feb. 12, 2013, 5:24 p.m. UTC | #2

On Tue, Feb 12, 2013 at 05:15:01PM +0000, Russell King - ARM Linux wrote:
> On Tue, Feb 12, 2013 at 05:12:17PM +0000, Mark Rutland wrote:
> > [...]
> > 
> > > So, things to be done here:
> > > 1. Fix the #else part of the code.
> > > 2. Fix the reported oops.
> > 
> > I believe the patch below solves point 1. Nothing refers to smp_timer_broadcast
> > any more (as I've tested with git grep), so removing it shouldn't create any
> > additional problems.
> > 
> > Russell, are you happy for me to drop this in the patch system?
> 
> Yes, it might as well go into the devel-stable branch along with your
> other patches.  Thanks.
> 

Submitted as 7651/1.

Thanks,
Mark.

Patch

diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
index b7e3b50..ab9458d 100644
--- a/arch/arm/kernel/smp.c
+++ b/arch/arm/kernel/smp.c
@@ -480,8 +480,6 @@  void tick_broadcast(const struct cpumask *mask)
 {
 	smp_cross_call(mask, IPI_TIMER);
 }
-#else
-#define smp_timer_broadcast	NULL
 #endif
 
 static void broadcast_timer_set_mode(enum clock_event_mode mode,