Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 73557af5 authored by James Bottomley's avatar James Bottomley Committed by Ingo Molnar
Browse files

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: default avatarIngo Molnar <mingo@elte.hu>
parent 45beca08

arch/x86/include/asm/voyager.h

+1 −0
Original line number Diff line number Diff line
@@ -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

arch/x86/mach-voyager/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

arch/x86/mach-voyager/voyager_smp.c

+1 −1
Original line number Diff line number Diff line
@@ -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;