From 4391990cc6d586a72dd7eed796a4a5fb15a7173e Mon Sep 17 00:00:00 2001 From: Scott Wood Date: Mon, 21 Jan 2013 19:56:43 -0600 Subject: [PATCH] --- yaml --- r: 356459 b: refs/heads/master c: 64871ff6e8f19c99bc6b9a93e4f8926e1650e61e h: refs/heads/master i: 356457: ed7b758abb1b25a3a9aa2bcf85369e3395cfe71f 356455: 3af5c1fb222404db4f36189a3d21968ec6846baa v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/85xx/qemu_e500.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 05ec44e85705..684bbfc9a62e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7c509ee01496a170fe4329f076c334591b6f49d0 +refs/heads/master: 64871ff6e8f19c99bc6b9a93e4f8926e1650e61e diff --git a/trunk/arch/powerpc/platforms/85xx/qemu_e500.c b/trunk/arch/powerpc/platforms/85xx/qemu_e500.c index f6ea5618c733..5cefc5a9a144 100644 --- a/trunk/arch/powerpc/platforms/85xx/qemu_e500.c +++ b/trunk/arch/powerpc/platforms/85xx/qemu_e500.c @@ -29,9 +29,10 @@ void __init qemu_e500_pic_init(void) { struct mpic *mpic; + unsigned int flags = MPIC_BIG_ENDIAN | MPIC_SINGLE_DEST_CPU | + MPIC_ENABLE_COREINT; - mpic = mpic_alloc(NULL, 0, MPIC_BIG_ENDIAN | MPIC_SINGLE_DEST_CPU, - 0, 256, " OpenPIC "); + mpic = mpic_alloc(NULL, 0, flags, 0, 256, " OpenPIC "); BUG_ON(mpic == NULL); mpic_init(mpic); @@ -66,7 +67,7 @@ define_machine(qemu_e500) { #ifdef CONFIG_PCI .pcibios_fixup_bus = fsl_pcibios_fixup_bus, #endif - .get_irq = mpic_get_irq, + .get_irq = mpic_get_coreint_irq, .restart = fsl_rstcr_restart, .calibrate_decr = generic_calibrate_decr, .progress = udbg_progress,