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

Commit 9177ae43 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Paul Mackerras
Browse files

[PATCH] powerpc: Fix g5 build with xmon 



My previous patches inadvertently broke building a G5 kernel with
CONFIG_XMON enabled. This fixes it.

Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 404849bb

arch/powerpc/platforms/powermac/pic.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -459,7 +459,7 @@ void __init pmac_pic_init(void) 
			mpic_setup_cascade(irqctrler2->intrs[0].line,

			mpic_setup_cascade(irqctrler2->intrs[0].line,

					   pmac_u3_cascade, mpic2);

					   pmac_u3_cascade, mpic2);

		}

		}

#ifdef CONFIG_XMON

#if defined(CONFIG_XMON) && defined(CONFIG_PPC32)

		{

		{

			struct device_node* pswitch;

			struct device_node* pswitch;

			int nmi_irq;

			int nmi_irq;
@@ -471,7 +471,7 @@ void __init pmac_pic_init(void) 
				setup_irq(nmi_irq, &xmon_action);

				setup_irq(nmi_irq, &xmon_action);

			}

			}

		}

		}

#endif	/* CONFIG_XMON */

#endif	/* defined(CONFIG_XMON) && defined(CONFIG_PPC32) */

		return;

		return;

	}

	}

	irqctrler = NULL;

	irqctrler = NULL;