Received: from mnm [127.0.0.1]
	by localhost with POP3 (fetchmail-5.9.0)
	for akpm@localhost (single-drop); Wed, 19 Nov 2003 08:03:26 -0800 (PST)
Received: from fire-1.osdl.org (air1.pdx.osdl.net [172.20.0.5])
	by mail.osdl.org (8.11.6/8.11.6) with ESMTP id hAJFqfC12185
	for <akpm@osdl.org>; Wed, 19 Nov 2003 07:52:41 -0800
Received: from lists.samba.org (dp.samba.org [66.70.73.150])
	by fire-1.osdl.org (8.12.8/8.12.8) with ESMTP id hAJFqfON012821
	for <akpm@osdl.org>; Wed, 19 Nov 2003 07:52:41 -0800
Received: by lists.samba.org (Postfix, from userid 504)
	id D34CF2CBE9; Wed, 19 Nov 2003 15:52:40 +0000 (GMT)
Date: Thu, 20 Nov 2003 02:47:32 +1100
From: Anton Blanchard <anton@samba.org>
To: akpm@osdl.org
Subject: [anton@samba.org: [PATCH] revert ppc64 IRQ_INPROGRESS change]
Message-ID: <20031119154732.GJ26020@krispykreme>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
User-Agent: Mutt/1.5.4i
X-Scanned-By: MIMEDefang 2.36
X-Spam-Checker-Version: SpamAssassin 2.60 (1.212-2003-09-23-exp) on mnm
X-Spam-Level: 
X-Spam-Status: No, hits=-4.9 required=2.0 tests=BAYES_00 autolearn=ham 
	version=2.60


----- Forwarded message from Anton Blanchard <anton@samba.org> -----

From: Anton Blanchard <anton@samba.org>
To: linuxppc64-dev@lists.linuxppc.org
Subject: Re: important ppc64 bug fixes

> - revert IRQ_INPROGRESS change			(Anton)

Revert the IRQ_INPROGRESS fix as x86 has done recently.

--- linux-2.5/arch/ppc64/kernel/irq.c	2003-10-18 07:30:09.000000000 +1000
+++ for-linus-ppc64/arch/ppc64/kernel/irq.c	2003-11-11 17:12:39.508732513 +1100
@@ -300,7 +300,7 @@
 	spin_lock_irqsave(&desc->lock, flags);
 	switch (desc->depth) {
 	case 1: {
-		unsigned int status = desc->status & ~(IRQ_DISABLED | IRQ_INPROGRESS);
+		unsigned int status = desc->status & ~IRQ_DISABLED;
 		desc->status = status;
 		if ((status & (IRQ_PENDING | IRQ_REPLAY)) == IRQ_PENDING) {
 			desc->status = status | IRQ_REPLAY;

----- End forwarded message -----