From befb3bb7f31d2e1bd7f8a30b6a5a8e41f52925b6 Mon Sep 17 00:00:00 2001
From: Shawn Guo <shawn.guo@linaro.org>
Date: Thu, 6 Oct 2011 15:19:14 +0100
Subject: [PATCH] --- yaml --- r: 264619 b: refs/heads/master c:
 0af8aa0069e43f90d59666510342c05e97d8c4b8 h: refs/heads/master i:   264617:
 09eb87bb8e0afdf2a1d6518fb064064911b47f91   264615:
 04ecde80f75430c92bf6692c7b39861045f5870e v: v3

---
 [refs]                                  | 2 +-
 trunk/arch/arm/include/asm/localtimer.h | 4 ++++
 trunk/arch/arm/kernel/smp.c             | 5 +++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1fa95e216f35..7e51f03e97d0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 0b5a1b95dcdfa451125132d5ce3f79a27ffb0950
+refs/heads/master: 0af8aa0069e43f90d59666510342c05e97d8c4b8
diff --git a/trunk/arch/arm/include/asm/localtimer.h b/trunk/arch/arm/include/asm/localtimer.h
index 080d74f8128d..3306f281333c 100644
--- a/trunk/arch/arm/include/asm/localtimer.h
+++ b/trunk/arch/arm/include/asm/localtimer.h
@@ -22,6 +22,10 @@ void percpu_timer_setup(void);
  */
 asmlinkage void do_local_timer(struct pt_regs *);
 
+/*
+ * Called from C code
+ */
+void handle_local_timer(struct pt_regs *);
 
 #ifdef CONFIG_LOCAL_TIMERS
 
diff --git a/trunk/arch/arm/kernel/smp.c b/trunk/arch/arm/kernel/smp.c
index 2e49f1883fe9..0949007d09a8 100644
--- a/trunk/arch/arm/kernel/smp.c
+++ b/trunk/arch/arm/kernel/smp.c
@@ -479,6 +479,11 @@ static void ipi_timer(void)
 
 #ifdef CONFIG_LOCAL_TIMERS
 asmlinkage void __exception_irq_entry do_local_timer(struct pt_regs *regs)
+{
+	handle_local_timer(regs);
+}
+
+void handle_local_timer(struct pt_regs *regs)
 {
 	struct pt_regs *old_regs = set_irq_regs(regs);
 	int cpu = smp_processor_id();