Skip to content

Commit

Permalink
[PATCH] powerpc: Fix g5 build with xmon
Browse files Browse the repository at this point in the history
My previous patches inadvertently broke building a G5 kernel with
CONFIG_XMON enabled. This fixes it.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Benjamin Herrenschmidt authored and Paul Mackerras committed Jan 9, 2006
1 parent 404849b commit 9177ae4
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions arch/powerpc/platforms/powermac/pic.c
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ void __init pmac_pic_init(void)
mpic_setup_cascade(irqctrler2->intrs[0].line,
pmac_u3_cascade, mpic2);
}
#ifdef CONFIG_XMON
#if defined(CONFIG_XMON) && defined(CONFIG_PPC32)
{
struct device_node* pswitch;
int nmi_irq;
Expand All @@ -471,7 +471,7 @@ void __init pmac_pic_init(void)
setup_irq(nmi_irq, &xmon_action);
}
}
#endif /* CONFIG_XMON */
#endif /* defined(CONFIG_XMON) && defined(CONFIG_PPC32) */
return;
}
irqctrler = NULL;
Expand Down

0 comments on commit 9177ae4

Please sign in to comment.