Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754654Ab0A0Tco (ORCPT ); Wed, 27 Jan 2010 14:32:44 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1754614Ab0A0Tck (ORCPT ); Wed, 27 Jan 2010 14:32:40 -0500 Received: from wolverine02.qualcomm.com ([199.106.114.251]:12510 "EHLO wolverine02.qualcomm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754332Ab0A0Tcf (ORCPT ); Wed, 27 Jan 2010 14:32:35 -0500 X-IronPort-AV: E=McAfee;i="5400,1158,5874"; a="32894956" From: adharmap@codeaurora.org To: linux-arm-kernel@lists.infradead.org Cc: Russell King , Ingo Molnar , Catalin Marinas , Yinghai Lu , Tony Lindgren , Santosh Shilimkar , Kevin Hilman , Kalle Valo , Jean Pihet , Linus Walleij , Colin Tuckley , Philby John , Srinidhi Kasagar , Alessandro Rubini , Andrea Gallo , linux-kernel@vger.kernel.org, linux-omap@vger.kernel.org, Abhijeet Dharmapurikar Subject: [PATCH 1/5] gic: prevent gic from crossing NR_IRQ Date: Wed, 27 Jan 2010 11:32:25 -0800 Message-Id: <1264620749-24527-2-git-send-email-adharmap@codeaurora.org> X-Mailer: git-send-email 1.5.6.3 In-Reply-To: <1264620749-24527-1-git-send-email-adharmap@codeaurora.org> References: <1264620749-24527-1-git-send-email-adharmap@codeaurora.org> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1467 Lines: 43 From: Abhijeet Dharmapurikar The gic code tries to initialize interrupts beyond NR_IRQ. Prevent code from doing that. Signed-off-by: Abhijeet Dharmapurikar --- arch/arm/common/gic.c | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/arch/arm/common/gic.c b/arch/arm/common/gic.c index 337741f..e763c4c 100644 --- a/arch/arm/common/gic.c +++ b/arch/arm/common/gic.c @@ -175,6 +175,11 @@ void __init gic_cascade_irq(unsigned int gic_nr, unsigned int irq) set_irq_chained_handler(irq, gic_handle_cascade_irq); } +/* + * In case of multiple cascaded GICs, order calls to gic_dist_init with + * ascending irq_start + */ + void __init gic_dist_init(unsigned int gic_nr, void __iomem *base, unsigned int irq_start) { @@ -233,7 +238,7 @@ void __init gic_dist_init(unsigned int gic_nr, void __iomem *base, /* * Setup the Linux IRQ subsystem. */ - for (i = irq_start; i < gic_data[gic_nr].irq_offset + max_irq; i++) { + for (i = irq_start; i < NR_IRQS && i < gic_data[gic_nr].irq_offset + max_irq; i++) { set_irq_chip(i, &gic_chip); set_irq_chip_data(i, &gic_data[gic_nr]); set_irq_handler(i, handle_level_irq); -- 1.5.6.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/