diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2013-09-03 12:19:28 -0400 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2013-09-03 12:19:28 -0400 |
| commit | 17efb59adc617dde76c839dcb5d5765dd5928b2b (patch) | |
| tree | 354946fcc299cc4ca1d62e5f40a7b3a35b7f43af | |
| parent | 4defe4559e86e26545ab2f542656a4b966dcde53 (diff) | |
MIPS: Move declaration of Octeon function fixup_irqs() to header.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
| -rw-r--r-- | arch/mips/cavium-octeon/octeon-irq.c | 2 | ||||
| -rw-r--r-- | arch/mips/cavium-octeon/smp.c | 4 | ||||
| -rw-r--r-- | arch/mips/include/asm/octeon/octeon.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/arch/mips/cavium-octeon/octeon-irq.c b/arch/mips/cavium-octeon/octeon-irq.c index 9d36774bded1..25fbfae06c1f 100644 --- a/arch/mips/cavium-octeon/octeon-irq.c +++ b/arch/mips/cavium-octeon/octeon-irq.c | |||
| @@ -1776,7 +1776,7 @@ asmlinkage void plat_irq_dispatch(void) | |||
| 1776 | 1776 | ||
| 1777 | #ifdef CONFIG_HOTPLUG_CPU | 1777 | #ifdef CONFIG_HOTPLUG_CPU |
| 1778 | 1778 | ||
| 1779 | void fixup_irqs(void) | 1779 | void octeon_fixup_irqs(void) |
| 1780 | { | 1780 | { |
| 1781 | irq_cpu_offline(); | 1781 | irq_cpu_offline(); |
| 1782 | } | 1782 | } |
diff --git a/arch/mips/cavium-octeon/smp.c b/arch/mips/cavium-octeon/smp.c index 138cc80c5928..24a2167db778 100644 --- a/arch/mips/cavium-octeon/smp.c +++ b/arch/mips/cavium-octeon/smp.c | |||
| @@ -255,8 +255,6 @@ static void octeon_cpus_done(void) | |||
| 255 | /* State of each CPU. */ | 255 | /* State of each CPU. */ |
| 256 | DEFINE_PER_CPU(int, cpu_state); | 256 | DEFINE_PER_CPU(int, cpu_state); |
| 257 | 257 | ||
| 258 | extern void fixup_irqs(void); | ||
| 259 | |||
| 260 | static int octeon_cpu_disable(void) | 258 | static int octeon_cpu_disable(void) |
| 261 | { | 259 | { |
| 262 | unsigned int cpu = smp_processor_id(); | 260 | unsigned int cpu = smp_processor_id(); |
| @@ -267,7 +265,7 @@ static int octeon_cpu_disable(void) | |||
| 267 | set_cpu_online(cpu, false); | 265 | set_cpu_online(cpu, false); |
| 268 | cpu_clear(cpu, cpu_callin_map); | 266 | cpu_clear(cpu, cpu_callin_map); |
| 269 | local_irq_disable(); | 267 | local_irq_disable(); |
| 270 | fixup_irqs(); | 268 | octeon_fixup_irqs(); |
| 271 | local_irq_enable(); | 269 | local_irq_enable(); |
| 272 | 270 | ||
| 273 | flush_cache_all(); | 271 | flush_cache_all(); |
diff --git a/arch/mips/include/asm/octeon/octeon.h b/arch/mips/include/asm/octeon/octeon.h index a2eed23c49a9..f5d77b91537f 100644 --- a/arch/mips/include/asm/octeon/octeon.h +++ b/arch/mips/include/asm/octeon/octeon.h | |||
| @@ -251,4 +251,6 @@ extern void (*octeon_irq_setup_secondary)(void); | |||
| 251 | typedef void (*octeon_irq_ip4_handler_t)(void); | 251 | typedef void (*octeon_irq_ip4_handler_t)(void); |
| 252 | void octeon_irq_set_ip4_handler(octeon_irq_ip4_handler_t); | 252 | void octeon_irq_set_ip4_handler(octeon_irq_ip4_handler_t); |
| 253 | 253 | ||
| 254 | extern void octeon_fixup_irqs(void); | ||
| 255 | |||
| 254 | #endif /* __ASM_OCTEON_OCTEON_H */ | 256 | #endif /* __ASM_OCTEON_OCTEON_H */ |
