rpms/kernel/devel linux-2.6-ia64-nullptr-irq-mask.patch,NONE,1.1

Thu Mar 8 16:53:00 UTC 2007

Author: davej

Update of /cvs/dist/rpms/kernel/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv2656

Added Files:
	linux-2.6-ia64-nullptr-irq-mask.patch 
Log Message:
* Thu Mar 08 2007 Dave Jones <davej at redhat.com>
- [IA64] fix NULL pointer in ia64/irq_chip-mask/unmask function


linux-2.6-ia64-nullptr-irq-mask.patch:
 kernel/iosapic.c |    8 ++++++--
 sn/kernel/irq.c  |   14 +++++++++++++-
 2 files changed, 19 insertions(+), 3 deletions(-)

--- NEW FILE linux-2.6-ia64-nullptr-irq-mask.patch ---
>From davej  Thu Mar  8 09:43:00 2007
Return-Path: <fedora-ia64-list-bounces at redhat.com>
X-Spam-Checker-Version: SpamAssassin 3.1.8 (2007-02-13) on
	gelk.kernelslacker.org
X-Spam-Level: 
X-Spam-Status: No, score=-2.1 required=5.0 tests=AWL,BAYES_00,
	UNPARSEABLE_RELAY autolearn=ham version=3.1.8
Received: from pobox.devel.redhat.com [10.11.255.8]
	by gelk.kernelslacker.org with IMAP (fetchmail-6.3.6)
	for <davej at localhost> (single-drop); Thu, 08 Mar 2007 09:43:00 -0500 (EST)
Received: from pobox.devel.redhat.com ([unix socket])
	 by pobox.devel.redhat.com (Cyrus v2.2.12-Invoca-RPM-2.2.12-3.RHEL4.1) with LMTPA;
	 Thu, 08 Mar 2007 09:41:18 -0500
X-Sieve: CMU Sieve 2.2
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
	by pobox.devel.redhat.com (8.13.1/8.13.1) with ESMTP id l28EfI6F021323
	for <davej at pobox.devel.redhat.com>; Thu, 8 Mar 2007 09:41:18 -0500
Received: from mx1.util.phx.redhat.com (mx1.util.phx.redhat.com [10.8.4.92])
	by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id l28EfHSI018677;
	Thu, 8 Mar 2007 09:41:17 -0500
Received: from hormel.redhat.com (hormel.util.phx.redhat.com [10.8.4.111])
	by mx1.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id l28EfCPa010347;
	Thu, 8 Mar 2007 09:41:12 -0500
Received: from listman.util.phx.redhat.com (listman.util.phx.redhat.com [10.8.4.110])
	by hormel.redhat.com (Postfix) with ESMTP
	id 03FA973297; Thu,  8 Mar 2007 09:41:12 -0500 (EST)
Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com
	[172.16.52.254])
	by listman.util.phx.redhat.com (8.13.1/8.13.1) with ESMTP id
	l28Ef9iq015905 for <fedora-ia64-list at listman.util.phx.redhat.com>;
	Thu, 8 Mar 2007 09:41:10 -0500
Received: from mail.boston.redhat.com (mail.boston.redhat.com [172.16.76.12])
	by int-mx1.corp.redhat.com (8.13.1/8.13.1) with ESMTP id
	l28Ef9Fx018649 for <fedora-ia64-list at int-mx1.corp.redhat.com>;
	Thu, 8 Mar 2007 09:41:09 -0500
Received: from prarit.boston.redhat.com (prarit.boston.redhat.com
	[172.16.80.158])
	by mail.boston.redhat.com (8.12.11.20060308/8.12.11) with ESMTP id
	l28Ef8L7031703; Thu, 8 Mar 2007 09:41:08 -0500
Date: Thu, 8 Mar 2007 09:41:08 -0500
From: Prarit Bhargava <prarit at redhat.com>
To: fedora-ia64-list at redhat.com
Message-Id: <20070308144108.17801.81026.sendpatchset at prarit.boston.redhat.com>
X-loop: fedora-ia64-list at redhat.com
Cc: 
Subject: [Fedora-ia64-list] [Fedora PATCH]: NULL pointer in ia64/irq
	chip-mask/unmask function
X-BeenThere: fedora-ia64-list at redhat.com
X-Mailman-Version: 2.1.5
Precedence: junk
Reply-To: ia64 Fedora Core Development <fedora-ia64-list at redhat.com>
List-Id: ia64 Fedora Core Development <fedora-ia64-list.redhat.com>
List-Unsubscribe: <https://www.redhat.com/mailman/listinfo/fedora-ia64-list>, 
	<mailto:fedora-ia64-list-request at redhat.com?subject=unsubscribe>
List-Archive: <https://www.redhat.com/archives/fedora-ia64-list>
List-Post: <mailto:fedora-ia64-list at redhat.com>
List-Help: <mailto:fedora-ia64-list-request at redhat.com?subject=help>
List-Subscribe: <https://www.redhat.com/mailman/listinfo/fedora-ia64-list>,
	<mailto:fedora-ia64-list-request at redhat.com?subject=subscribe>
Sender: fedora-ia64-list-bounces at redhat.com
Errors-To: fedora-ia64-list-bounces at redhat.com
Status: RO
Content-Length: 3073
Lines: 103

Dave/Chuck,

From

http://marc.theaimsgroup.com/?l=linux-ia64&m=117330888525162&w=2

Resolves BZ 231219.

Successfully tested by me.


From: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>

    [IA64] fix NULL pointer in ia64/irq_chip-mask/unmask function
    
    This patch fixes boot failure because irq_desc->mask() is NULL.
    
    - Added mask/unmask functions to ia64's irq desc function table.
    - rename hw_interrupt_type to irq_chip. hw_interrupt_type is old name.
    - Tony: Added same change to arch/ia64/sn/kernel/irq.c as pointed out
      by Eric Biederman ... mask/unmask functions there can be no-op.
    
    Signed-off-by: KAMEZAWA Hiroyuki <kamezawa.hiroyu at jp.fujitsu.com>
    Signed-off-by: Andrew Morton <akpm at linux-foundation.org>
    Signed-off-by: Tony Luck <tony.luck at intel.com>

diff --git a/arch/ia64/kernel/iosapic.c b/arch/ia64/kernel/iosapic.c
index d6aab40..dcfbf3e 100644
--- a/arch/ia64/kernel/iosapic.c
+++ b/arch/ia64/kernel/iosapic.c
@@ -446,7 +446,7 @@ #define iosapic_enable_level_irq	unmask_
 #define iosapic_disable_level_irq	mask_irq
 #define iosapic_ack_level_irq		nop
 
-struct hw_interrupt_type irq_type_iosapic_level = {
+struct irq_chip irq_type_iosapic_level = {
 	.name =		"IO-SAPIC-level",
 	.startup =	iosapic_startup_level_irq,
 	.shutdown =	iosapic_shutdown_level_irq,
@@ -454,6 +454,8 @@ struct hw_interrupt_type irq_type_iosapi
 	.disable =	iosapic_disable_level_irq,
 	.ack =		iosapic_ack_level_irq,
 	.end =		iosapic_end_level_irq,
+	.mask =		mask_irq,
+	.unmask =	unmask_irq,
 	.set_affinity =	iosapic_set_affinity
 };
 
@@ -493,7 +495,7 @@ #define iosapic_enable_edge_irq		unmask_
 #define iosapic_disable_edge_irq	nop
 #define iosapic_end_edge_irq		nop
 
-struct hw_interrupt_type irq_type_iosapic_edge = {
+struct irq_chip irq_type_iosapic_edge = {
 	.name =		"IO-SAPIC-edge",
 	.startup =	iosapic_startup_edge_irq,
 	.shutdown =	iosapic_disable_edge_irq,
@@ -501,6 +503,8 @@ struct hw_interrupt_type irq_type_iosapi
 	.disable =	iosapic_disable_edge_irq,
 	.ack =		iosapic_ack_edge_irq,
 	.end =		iosapic_end_edge_irq,
+	.mask =		mask_irq,
+	.unmask =	unmask_irq,
 	.set_affinity =	iosapic_set_affinity
 };
 
diff --git a/arch/ia64/sn/kernel/irq.c b/arch/ia64/sn/kernel/irq.c
index 8c5bee0..8d2a1bf 100644
--- a/arch/ia64/sn/kernel/irq.c
+++ b/arch/ia64/sn/kernel/irq.c
@@ -205,7 +205,17 @@ static void sn_set_affinity_irq(unsigned
 		(void)sn_retarget_vector(sn_irq_info, nasid, slice);
 }
 
-struct hw_interrupt_type irq_type_sn = {
+static void
+sn_mask_irq(unsigned int irq)
+{
+}
+
+static void
+sn_unmask_irq(unsigned int irq)
+{
+}
+
+struct irq_chip irq_type_sn = {
 	.name		= "SN hub",
 	.startup	= sn_startup_irq,
 	.shutdown	= sn_shutdown_irq,
@@ -213,6 +223,8 @@ struct hw_interrupt_type irq_type_sn = {
 	.disable	= sn_disable_irq,
 	.ack		= sn_ack_irq,
 	.end		= sn_end_irq,
+	.mask		= sn_mask_irq,
+	.unmask		= sn_unmask_irq,
 	.set_affinity	= sn_set_affinity_irq
 };
 

--
Fedora-ia64-list mailing list
Fedora-ia64-list at redhat.com
https://www.redhat.com/mailman/listinfo/fedora-ia64-list



