From e3f790d64154a9f7d4fa127fa7f7952e90ba33f6 Mon Sep 17 00:00:00 2001 From: Anton Vorontsov Date: Sat, 24 May 2008 04:40:00 +1000 Subject: [PATCH] --- yaml --- r: 101633 b: refs/heads/master c: 5073e7ee8684f3997b3633a2e5fa574027f37891 h: refs/heads/master i: 101631: ce916a446606795c26acc08595a6684a08a0c97b v: v3 --- [refs] | 2 +- trunk/arch/powerpc/sysdev/mpic.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 67a0e40e6b02..06d2caaf13ef 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 8a3e1c670e503ddd6f6c373b307f38b783ee3a50 +refs/heads/master: 5073e7ee8684f3997b3633a2e5fa574027f37891 diff --git a/trunk/arch/powerpc/sysdev/mpic.c b/trunk/arch/powerpc/sysdev/mpic.c index f99f81abbd5c..a281341e4129 100644 --- a/trunk/arch/powerpc/sysdev/mpic.c +++ b/trunk/arch/powerpc/sysdev/mpic.c @@ -1143,13 +1143,14 @@ struct mpic * __init mpic_alloc(struct device_node *node, greg_feature = mpic_read(mpic->gregs, MPIC_INFO(GREG_FEATURE_0)); mpic->num_cpus = ((greg_feature & MPIC_GREG_FEATURE_LAST_CPU_MASK) >> MPIC_GREG_FEATURE_LAST_CPU_SHIFT) + 1; - if (isu_size == 0) + if (isu_size == 0) { if (flags & MPIC_BROKEN_FRR_NIRQS) mpic->num_sources = mpic->irq_count; else mpic->num_sources = ((greg_feature & MPIC_GREG_FEATURE_LAST_SRC_MASK) >> MPIC_GREG_FEATURE_LAST_SRC_SHIFT) + 1; + } /* Map the per-CPU registers */ for (i = 0; i < mpic->num_cpus; i++) {