diff options
author | Ingo Molnar <mingo@elte.hu> | 2008-12-23 16:23:23 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-12-23 16:23:23 +0100 |
commit | 1ccedb7cdba6886939dd8b4c8f965a826f696e56 (patch) | |
tree | 0f5fc519a68faca5318c296315c9b6c502907056 /arch/sparc/kernel/sun4m_smp.c | |
parent | a98f8fd24fb24fcb9a359553e64dd6aac5cf4279 (diff) | |
parent | 929096fe9ff1f4b3645cf3919527ab47e8d5e17c (diff) | |
download | kernel_samsung_espresso10-1ccedb7cdba6886939dd8b4c8f965a826f696e56.zip kernel_samsung_espresso10-1ccedb7cdba6886939dd8b4c8f965a826f696e56.tar.gz kernel_samsung_espresso10-1ccedb7cdba6886939dd8b4c8f965a826f696e56.tar.bz2 |
Merge commit 'v2.6.28-rc9' into x86/apic
Diffstat (limited to 'arch/sparc/kernel/sun4m_smp.c')
-rw-r--r-- | arch/sparc/kernel/sun4m_smp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/kernel/sun4m_smp.c b/arch/sparc/kernel/sun4m_smp.c index 5fc386d..4f8d605 100644 --- a/arch/sparc/kernel/sun4m_smp.c +++ b/arch/sparc/kernel/sun4m_smp.c @@ -343,7 +343,7 @@ void smp4m_percpu_timer_interrupt(struct pt_regs *regs) extern unsigned int lvl14_resolution; -static void __init smp_setup_percpu_timer(void) +static void __cpuinit smp_setup_percpu_timer(void) { int cpu = smp_processor_id(); |