diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-12-04 08:52:14 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-12-04 08:52:14 +0100 |
| commit | cb9c34e6d090d376b77becaa5d29a65dec7f4272 (patch) | |
| tree | 3678abce20d6825aebe3fec218057d4131e13fd6 /arch/sparc/kernel/sun4m_smp.c | |
| parent | genirq: warn when IRQF_DISABLED may be ignored (diff) | |
| parent | Linux 2.6.28-rc7 (diff) | |
| download | linux-cb9c34e6d090d376b77becaa5d29a65dec7f4272.tar.xz linux-cb9c34e6d090d376b77becaa5d29a65dec7f4272.zip | |
Merge commit 'v2.6.28-rc7' into core/locking
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 5fc386d08c47..4f8d60586b07 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(); |