Commit 6cf2b3fc authored by Kumar Gala's avatar Kumar Gala Committed by Linus Torvalds

[PATCH] ppc32: i8259 PIC should not be initialized if PCI is not configured

Trying to initialize the i8259 PIC will not work if CONFIG_PCI is not
enabled.  The kernel hangs if the initialization is tried.
Signed-off-by: default avatarKumar Gala <kumar.gala@freescale.com>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent f9e4a005
...@@ -200,12 +200,14 @@ mpc85xx_cds_init_IRQ(void) ...@@ -200,12 +200,14 @@ mpc85xx_cds_init_IRQ(void)
*/ */
openpic_init(MPC85xx_OPENPIC_IRQ_OFFSET); openpic_init(MPC85xx_OPENPIC_IRQ_OFFSET);
#ifdef CONFIG_PCI
openpic_hookup_cascade(PIRQ0A, "82c59 cascade", i8259_irq); openpic_hookup_cascade(PIRQ0A, "82c59 cascade", i8259_irq);
for (i = 0; i < NUM_8259_INTERRUPTS; i++) for (i = 0; i < NUM_8259_INTERRUPTS; i++)
irq_desc[i].handler = &i8259_pic; irq_desc[i].handler = &i8259_pic;
i8259_init(0); i8259_init(0);
#endif
#ifdef CONFIG_CPM2 #ifdef CONFIG_CPM2
/* Setup CPM2 PIC */ /* Setup CPM2 PIC */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment