diff options
author | David S. Miller <davem@davemloft.net> | 2008-09-14 01:07:56 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-09-20 00:17:58 -0400 |
commit | 1de937a536ea1a132d22dc198a9e07d208d40a29 (patch) | |
tree | 5b969f29fab3f910e1f7e40a84ebf71bd5502e7d | |
parent | a73554aedb8f69bd2024cbbf74980582bb91afb4 (diff) |
sparc32: Call sun4m_clear_profile_irq() directly from sun4m_smp.c
This is the only use of the clear_profile_irq() btfixup entry,
which just eats up lots of dead space on other platform types.
A subsequent commit will delete the other implementations and
the btfixup entry as well.
Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r-- | arch/sparc/kernel/sun4m_irq.c | 3 | ||||
-rw-r--r-- | arch/sparc/kernel/sun4m_smp.c | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/arch/sparc/kernel/sun4m_irq.c b/arch/sparc/kernel/sun4m_irq.c index 39d40e96d396..8e1ecc6def26 100644 --- a/arch/sparc/kernel/sun4m_irq.c +++ b/arch/sparc/kernel/sun4m_irq.c | |||
@@ -264,7 +264,8 @@ static void sun4m_clear_clock_irq(void) | |||
264 | sbus_readl(&timers_global->l10_limit); | 264 | sbus_readl(&timers_global->l10_limit); |
265 | } | 265 | } |
266 | 266 | ||
267 | static void sun4m_clear_profile_irq(int cpu) | 267 | /* Exported for sun4m_smp.c */ |
268 | void sun4m_clear_profile_irq(int cpu) | ||
268 | { | 269 | { |
269 | sbus_readl(&timers_percpu[cpu]->l14_limit); | 270 | sbus_readl(&timers_percpu[cpu]->l14_limit); |
270 | } | 271 | } |
diff --git a/arch/sparc/kernel/sun4m_smp.c b/arch/sparc/kernel/sun4m_smp.c index a14a76ac7f36..e3c0be17729f 100644 --- a/arch/sparc/kernel/sun4m_smp.c +++ b/arch/sparc/kernel/sun4m_smp.c | |||
@@ -313,6 +313,8 @@ void smp4m_cross_call_irq(void) | |||
313 | ccall_info.processors_out[i] = 1; | 313 | ccall_info.processors_out[i] = 1; |
314 | } | 314 | } |
315 | 315 | ||
316 | extern void sun4m_clear_profile_irq(int cpu); | ||
317 | |||
316 | void smp4m_percpu_timer_interrupt(struct pt_regs *regs) | 318 | void smp4m_percpu_timer_interrupt(struct pt_regs *regs) |
317 | { | 319 | { |
318 | struct pt_regs *old_regs; | 320 | struct pt_regs *old_regs; |
@@ -320,7 +322,7 @@ void smp4m_percpu_timer_interrupt(struct pt_regs *regs) | |||
320 | 322 | ||
321 | old_regs = set_irq_regs(regs); | 323 | old_regs = set_irq_regs(regs); |
322 | 324 | ||
323 | clear_profile_irq(cpu); | 325 | sun4m_clear_profile_irq(cpu); |
324 | 326 | ||
325 | profile_tick(CPU_PROFILING); | 327 | profile_tick(CPU_PROFILING); |
326 | 328 | ||