From 090dbe5493c25f52560e08f953868e0162896281 Mon Sep 17 00:00:00 2001
From: Mark Rutland <mark.rutland@arm.com>
Date: Tue, 30 Oct 2012 11:17:01 +0000
Subject: [PATCH] --- yaml --- r: 355812 b: refs/heads/master c:
 e2c501190c7d4bf9d7febb9e1f1094cbde59ed89 h: refs/heads/master v: v3

---
 [refs]                      |  2 +-
 trunk/arch/arm/kernel/smp.c | 10 +++-------
 2 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index fcc87f014d81..5bd7074100dd 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d954896edb658cf72dd069d92b5235c06521ffab
+refs/heads/master: e2c501190c7d4bf9d7febb9e1f1094cbde59ed89
diff --git a/trunk/arch/arm/kernel/smp.c b/trunk/arch/arm/kernel/smp.c
index 84f4cbf652e5..930851912b37 100644
--- a/trunk/arch/arm/kernel/smp.c
+++ b/trunk/arch/arm/kernel/smp.c
@@ -475,12 +475,6 @@ u64 smp_irq_stat_cpu(unsigned int cpu)
  */
 static DEFINE_PER_CPU(struct clock_event_device, percpu_clockevent);
 
-static void ipi_timer(void)
-{
-	struct clock_event_device *evt = &__get_cpu_var(percpu_clockevent);
-	evt->event_handler(evt);
-}
-
 #ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST
 static void smp_timer_broadcast(const struct cpumask *mask)
 {
@@ -596,11 +590,13 @@ void handle_IPI(int ipinr, struct pt_regs *regs)
 	case IPI_WAKEUP:
 		break;
 
+#ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST
 	case IPI_TIMER:
 		irq_enter();
-		ipi_timer();
+		tick_receive_broadcast();
 		irq_exit();
 		break;
+#endif
 
 	case IPI_RESCHEDULE:
 		scheduler_ipi();