Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752505AbYJUHYW (ORCPT ); Tue, 21 Oct 2008 03:24:22 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1751231AbYJUHYH (ORCPT ); Tue, 21 Oct 2008 03:24:07 -0400 Received: from mx3.mail.elte.hu ([157.181.1.138]:41405 "EHLO mx3.mail.elte.hu" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751012AbYJUHYG (ORCPT ); Tue, 21 Oct 2008 03:24:06 -0400 Date: Tue, 21 Oct 2008 09:23:40 +0200 From: Ingo Molnar To: Benjamin Herrenschmidt Cc: Linux Kernel Mailing List , Thomas Gleixner , David Brownell , Linus Torvalds , linuxppc-dev list , "H. Peter Anvin" Subject: [PATCH] genirq: fix set_irq_type() when recording trigger type Message-ID: <20081021072340.GA25136@elte.hu> References: <200810202205.m9KM5une024759@hera.kernel.org> <1224570730.7654.242.camel@pasglop> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <1224570730.7654.242.camel@pasglop> User-Agent: Mutt/1.5.18 (2008-05-17) X-ELTE-VirusStatus: clean X-ELTE-SpamScore: -1.5 X-ELTE-SpamLevel: X-ELTE-SpamCheck: no X-ELTE-SpamVersion: ELTE 2.0 X-ELTE-SpamCheck-Details: score=-1.5 required=5.9 tests=BAYES_00,DNS_FROM_SECURITYSAGE autolearn=no SpamAssassin version=3.2.3 -1.5 BAYES_00 BODY: Bayesian spam probability is 0 to 1% [score: 0.0000] 0.0 DNS_FROM_SECURITYSAGE RBL: Envelope sender in blackholes.securitysage.com Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2599 Lines: 66 * Benjamin Herrenschmidt wrote: > On Mon, 2008-10-20 at 22:05 +0000, Linux Kernel Mailing List wrote: > > Gitweb: http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=0c5d1eb77a8be917b638344a22afe1398236482b > > Commit: 0c5d1eb77a8be917b638344a22afe1398236482b > > Parent: d6d5aeb661fc14655c417f3582ae7ec52985d2a8 > > Author: David Brownell > > AuthorDate: Wed Oct 1 14:46:18 2008 -0700 > > Committer: Ingo Molnar > > CommitDate: Thu Oct 2 10:24:09 2008 +0200 [...] > > Signed-off-by: David Brownell > > Signed-off-by: Andrew Morton > > Acked-by: Thomas Gleixner > > Signed-off-by: Ingo Molnar > > This one is obviously broken and breaks booting on a whole bunch of > machines (including powermac's and thus my G5, it's never good when my > own machine breaks !). > > Nice to see 3 SOB's and one Ack and nobody caught the obvious bug :-) that patch came from -mm towards us shortly before the merge window. Once we had it integrated Chris Friesen reported a boot hang on a G5, and there's a fix pending for the bug, see it below. Will send it to Linus expressly. Fortunately only a minority of Linux users will ever run a box that uses set_irq_type() - but yes it needs to be fixed. Ingo ------------------------------> >From aac4ddd11a8d0e402ddc3fbc75204cb64efa0aac Mon Sep 17 00:00:00 2001 From: Chris Friesen Date: Mon, 20 Oct 2008 12:41:58 -0600 Subject: [PATCH] genirq: fix set_irq_type() when recording trigger type In set_irq_type() we want to pass the type rather than the current interrupt state. Signed-off-by: Chris Friesen Signed-off-by: Ingo Molnar --- kernel/irq/chip.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/kernel/irq/chip.c b/kernel/irq/chip.c index 4895fde..3de6ea3 100644 --- a/kernel/irq/chip.c +++ b/kernel/irq/chip.c @@ -127,7 +127,7 @@ int set_irq_type(unsigned int irq, unsigned int type) return 0; spin_lock_irqsave(&desc->lock, flags); - ret = __irq_set_trigger(desc, irq, flags); + ret = __irq_set_trigger(desc, irq, type); spin_unlock_irqrestore(&desc->lock, flags); return ret; } -- 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/