From 1292eacecf4d5d7a55224b706179020974818775 Mon Sep 17 00:00:00 2001
From: "David S. Miller" <davem@davemloft.net>
Date: Sat, 13 Sep 2008 22:07:56 -0700
Subject: [PATCH] --- yaml --- r: 113147 b: refs/heads/master c:
 1de937a536ea1a132d22dc198a9e07d208d40a29 h: refs/heads/master i:   113145:
 396d59869312ac3f9092c2e29143c24a25833bed   113143:
 c01f83d116c771d5cb6c7ab5ee6e3e5864729af1 v: v3

---
 [refs]                              | 2 +-
 trunk/arch/sparc/kernel/sun4m_irq.c | 3 ++-
 trunk/arch/sparc/kernel/sun4m_smp.c | 4 +++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index b2ed4ce30c0a..e40e7ba4e398 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a73554aedb8f69bd2024cbbf74980582bb91afb4
+refs/heads/master: 1de937a536ea1a132d22dc198a9e07d208d40a29
diff --git a/trunk/arch/sparc/kernel/sun4m_irq.c b/trunk/arch/sparc/kernel/sun4m_irq.c
index 39d40e96d396..8e1ecc6def26 100644
--- a/trunk/arch/sparc/kernel/sun4m_irq.c
+++ b/trunk/arch/sparc/kernel/sun4m_irq.c
@@ -264,7 +264,8 @@ static void sun4m_clear_clock_irq(void)
 	sbus_readl(&timers_global->l10_limit);
 }
 
-static void sun4m_clear_profile_irq(int cpu)
+/* Exported for sun4m_smp.c */
+void sun4m_clear_profile_irq(int cpu)
 {
 	sbus_readl(&timers_percpu[cpu]->l14_limit);
 }
diff --git a/trunk/arch/sparc/kernel/sun4m_smp.c b/trunk/arch/sparc/kernel/sun4m_smp.c
index a14a76ac7f36..e3c0be17729f 100644
--- a/trunk/arch/sparc/kernel/sun4m_smp.c
+++ b/trunk/arch/sparc/kernel/sun4m_smp.c
@@ -313,6 +313,8 @@ void smp4m_cross_call_irq(void)
 	ccall_info.processors_out[i] = 1;
 }
 
+extern void sun4m_clear_profile_irq(int cpu);
+
 void smp4m_percpu_timer_interrupt(struct pt_regs *regs)
 {
 	struct pt_regs *old_regs;
@@ -320,7 +322,7 @@ void smp4m_percpu_timer_interrupt(struct pt_regs *regs)
 
 	old_regs = set_irq_regs(regs);
 
-	clear_profile_irq(cpu);
+	sun4m_clear_profile_irq(cpu);
 
 	profile_tick(CPU_PROFILING);