x86, voyager: fix smp_intr_init() compile breakage
authorJames Bottomley <James.Bottomley@HansenPartnership.com>
Fri, 31 Oct 2008 17:59:49 +0000 (13:59 -0400)
committerIngo Molnar <mingo@elte.hu>
Mon, 3 Nov 2008 09:52:21 +0000 (10:52 +0100)
Impact: fix x86/Voyager build

Looks like this became static on the rest of x86.  Fix it up by adding
an external definition to mach-voyager/setup.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/include/asm/voyager.h
arch/x86/mach-voyager/setup.c
arch/x86/mach-voyager/voyager_smp.c

index 9c811d2e6f91bf1398c21173876177b9f0520eff..b3e647307625d5c035b92f5c1da4641f6d9f3fad 100644 (file)
@@ -520,6 +520,7 @@ extern void voyager_restart(void);
 extern void voyager_cat_power_off(void);
 extern void voyager_cat_do_common_interrupt(void);
 extern void voyager_handle_nmi(void);
+extern void voyager_smp_intr_init(void);
 /* Commands for the following are */
 #define        VOYAGER_PSI_READ        0
 #define VOYAGER_PSI_WRITE      1
index 6bbdd633864cc34f8ded68bc37d9bdde0d7e8a1f..a580b9562e76cc078ab3fd0b2b90c722d10fdf01 100644 (file)
@@ -27,7 +27,7 @@ static struct irqaction irq2 = {
 void __init intr_init_hook(void)
 {
 #ifdef CONFIG_SMP
-       smp_intr_init();
+       voyager_smp_intr_init();
 #endif
 
        setup_irq(2, &irq2);
index 7f4c6af143515af7633e79ddfbe65d6ab6dc98fb..0e331652681e4a247122f2381861b0403f88b93c 100644 (file)
@@ -1258,7 +1258,7 @@ static void handle_vic_irq(unsigned int irq, struct irq_desc *desc)
 #define QIC_SET_GATE(cpi, vector) \
        set_intr_gate((cpi) + QIC_DEFAULT_CPI_BASE, (vector))
 
-void __init smp_intr_init(void)
+void __init voyager_smp_intr_init(void)
 {
        int i;