To avoid multi-declaration error after adding migrate_irqs into
kernel/irq/migration.c, rename migrate_irqs() to move_irqs().

Cc: Jiang Liu <jiang....@linux.intel.com>
Cc: Thomas Gleixner <t...@linutronix.de>
Cc: Marc Zyngier <marc.zyng...@arm.com>
Cc: Mark Rutland <mark.rutl...@arm.com>
Cc: Will Deacon <will.dea...@arm.com>
Cc: Russell King - ARM Linux <li...@arm.linux.org.uk>
Cc: Hanjun Guo <hanjun....@linaro.org>
Signed-off-by: Yang Yingliang <yangyingli...@huawei.com>
---
 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 majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to