From 7a8e605c5552e6cbcfe257cb722c3dccc8f06c50 Mon Sep 17 00:00:00 2001 From: Haren Myneni Date: Tue, 27 Dec 2005 15:51:07 -0800 Subject: [PATCH] --- yaml --- r: 17219 b: refs/heads/master c: 9da5cad61c13fbdc7fc7aa425f03a15da9d0cb43 h: refs/heads/master i: 17217: d84e4c516010c2f4efa4cf6e50dbee2a44cc4f18 17215: 60bd883e31ee5d59e2f6d73b383d2dea565657e7 v: v3 --- [refs] | 2 +- trunk/arch/powerpc/platforms/pseries/setup.c | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index a0a55f1a952f..2718cb1e9cd7 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 79e7bac0d6ad56d62e2364313b5e5e5950c7385d +refs/heads/master: 9da5cad61c13fbdc7fc7aa425f03a15da9d0cb43 diff --git a/trunk/arch/powerpc/platforms/pseries/setup.c b/trunk/arch/powerpc/platforms/pseries/setup.c index 2cb082871210..38b631ceaec9 100644 --- a/trunk/arch/powerpc/platforms/pseries/setup.c +++ b/trunk/arch/powerpc/platforms/pseries/setup.c @@ -324,15 +324,18 @@ static void __init pSeries_discover_pic(void) ppc64_interrupt_controller = IC_INVALID; for (np = NULL; (np = of_find_node_by_name(np, "interrupt-controller"));) { typep = (char *)get_property(np, "compatible", NULL); - if (strstr(typep, "open-pic")) + if (strstr(typep, "open-pic")) { ppc64_interrupt_controller = IC_OPEN_PIC; - else if (strstr(typep, "ppc-xicp")) + break; + } else if (strstr(typep, "ppc-xicp")) { ppc64_interrupt_controller = IC_PPC_XIC; - else - printk("pSeries_discover_pic: failed to recognize" - " interrupt-controller\n"); - break; + break; + } } + if (ppc64_interrupt_controller == IC_INVALID) + printk("pSeries_discover_pic: failed to recognize" + " interrupt-controller\n"); + } static void pSeries_mach_cpu_die(void)