瀏覽代碼

x86, voyager: fix smp_intr_init() compile breakage

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>
James Bottomley 16 年之前
父節點
當前提交
73557af5bf
共有 3 個文件被更改,包括 3 次插入2 次删除
  1. 1 0
      arch/x86/include/asm/voyager.h
  2. 1 1
      arch/x86/mach-voyager/setup.c
  3. 1 1
      arch/x86/mach-voyager/voyager_smp.c

+ 1 - 0
arch/x86/include/asm/voyager.h

@@ -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

+ 1 - 1
arch/x86/mach-voyager/setup.c

@@ -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);

+ 1 - 1
arch/x86/mach-voyager/voyager_smp.c

@@ -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;