Commit 1c91cc57 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt
Browse files

powerpc/pmac/smp: Rename fixup_irqs() to migrate_irqs() and use it on ppc32 



Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent fb49f864

arch/powerpc/include/asm/smp.h

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ extern void start_secondary_resume(void); 
DECLARE_PER_CPU(unsigned int, cpu_pvr);



#ifdef CONFIG_HOTPLUG_CPU

extern void fixup_irqs(const struct cpumask *map);

extern void migrate_irqs(void);

int generic_cpu_disable(void);

void generic_cpu_die(unsigned int cpu);

void generic_mach_cpu_die(void);

arch/powerpc/kernel/irq.c

+2 −1
Original line number Diff line number Diff line
@@ -246,12 +246,13 @@ u64 arch_irq_stat_cpu(unsigned int cpu) 
}



#ifdef CONFIG_HOTPLUG_CPU

void fixup_irqs(const struct cpumask *map)

void migrate_irqs(void)

{

	struct irq_desc *desc;

	unsigned int irq;

	static int warned;

	cpumask_var_t mask;

	const struct cpumask *map = cpu_online_mask;



	alloc_cpumask_var(&mask, GFP_KERNEL);

arch/powerpc/kernel/smp.c

+1 −1
Original line number Diff line number Diff line
@@ -317,8 +317,8 @@ int generic_cpu_disable(void) 
	set_cpu_online(cpu, false);

#ifdef CONFIG_PPC64

	vdso_data->processorCount--;

	fixup_irqs(cpu_online_mask);

#endif

	migrate_irqs();

	return 0;

}