powerpc/pmac/smp: Rename fixup_irqs() to migrate_irqs() and use it on ppc32
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
This commit is contained in:
parent
fb49f864c3
commit
1c91cc5705
|
@ -41,7 +41,7 @@ extern void start_secondary_resume(void);
|
||||||
DECLARE_PER_CPU(unsigned int, cpu_pvr);
|
DECLARE_PER_CPU(unsigned int, cpu_pvr);
|
||||||
|
|
||||||
#ifdef CONFIG_HOTPLUG_CPU
|
#ifdef CONFIG_HOTPLUG_CPU
|
||||||
extern void fixup_irqs(const struct cpumask *map);
|
extern void migrate_irqs(void);
|
||||||
int generic_cpu_disable(void);
|
int generic_cpu_disable(void);
|
||||||
void generic_cpu_die(unsigned int cpu);
|
void generic_cpu_die(unsigned int cpu);
|
||||||
void generic_mach_cpu_die(void);
|
void generic_mach_cpu_die(void);
|
||||||
|
|
|
@ -246,12 +246,13 @@ u64 arch_irq_stat_cpu(unsigned int cpu)
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef CONFIG_HOTPLUG_CPU
|
#ifdef CONFIG_HOTPLUG_CPU
|
||||||
void fixup_irqs(const struct cpumask *map)
|
void migrate_irqs(void)
|
||||||
{
|
{
|
||||||
struct irq_desc *desc;
|
struct irq_desc *desc;
|
||||||
unsigned int irq;
|
unsigned int irq;
|
||||||
static int warned;
|
static int warned;
|
||||||
cpumask_var_t mask;
|
cpumask_var_t mask;
|
||||||
|
const struct cpumask *map = cpu_online_mask;
|
||||||
|
|
||||||
alloc_cpumask_var(&mask, GFP_KERNEL);
|
alloc_cpumask_var(&mask, GFP_KERNEL);
|
||||||
|
|
||||||
|
|
|
@ -317,8 +317,8 @@ int generic_cpu_disable(void)
|
||||||
set_cpu_online(cpu, false);
|
set_cpu_online(cpu, false);
|
||||||
#ifdef CONFIG_PPC64
|
#ifdef CONFIG_PPC64
|
||||||
vdso_data->processorCount--;
|
vdso_data->processorCount--;
|
||||||
fixup_irqs(cpu_online_mask);
|
|
||||||
#endif
|
#endif
|
||||||
|
migrate_irqs();
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue