To avoid multi-declaration error after adding migrate_irqs into kernel/irq/migration.c, rename migrate_irqs() to move_irqs().
Cc: Jiang Liu <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: Marc Zyngier <[email protected]> Cc: Mark Rutland <[email protected]> Cc: Will Deacon <[email protected]> Cc: Russell King - ARM Linux <[email protected]> Cc: Hanjun Guo <[email protected]> Signed-off-by: Yang Yingliang <[email protected]> --- arch/ia64/kernel/irq.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/ia64/kernel/irq.c b/arch/ia64/kernel/irq.c index de4fc00..005f339 100644 --- a/arch/ia64/kernel/irq.c +++ b/arch/ia64/kernel/irq.c @@ -98,7 +98,7 @@ unsigned int vectors_in_migration[NR_IRQS]; * Since cpu_online_mask is already updated, we just need to check for * affinity that has zeros */ -static void migrate_irqs(void) +static void move_irqs(void) { int irq, new_cpu; @@ -167,7 +167,7 @@ void fixup_irqs(void) * Phase 1: Locate IRQs bound to this cpu and * relocate them for cpu removal. */ - migrate_irqs(); + move_irqs(); /* * Phase 2: Perform interrupt processing for all entries reported in -- 2.5.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
