rpms/kernel/devel ppc-fix-parport_pc.patch, NONE, 1.1 kernel.spec, 1.1515, 1.1516

[Kyle McMartin]

Author: kyle

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv31434

Modified Files:
	kernel.spec 
Added Files:
	ppc-fix-parport_pc.patch 
Log Message:
* Mon Apr 13 2009 Kyle McMartin <kyle at redhat.com>
- ppc-fix-parport_pc.patch: add from linuxppc-dev@


ppc-fix-parport_pc.patch:

--- NEW FILE ppc-fix-parport_pc.patch ---
>From linuxppc-dev-bounces+kyle=mcmartin.ca at ozlabs.org Tue Apr  7 23:26:06 2009
Return-path: <linuxppc-dev-bounces+kyle=mcmartin.ca at ozlabs.org>
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on
	bombadil.infradead.org
X-Spam-Level: 
X-Spam-Status: No, score=-1.6 required=5.0 tests=AWL autolearn=ham
	version=3.2.5
Envelope-to: kyle at bombadil.infradead.org
Delivery-date: Wed, 08 Apr 2009 03:26:06 +0000
Received: from casper.infradead.org ([2001:770:15f::2])
	by bombadil.infradead.org with esmtps (Exim 4.69 #1 (Red Hat Linux))
	id 1LrOQQ-0006BX-H8
	for kyle at bombadil.infradead.org; Wed, 08 Apr 2009 03:26:06 +0000
Received: from ozlabs.org ([203.10.76.45])
	by casper.infradead.org with esmtps (Exim 4.69 #1 (Red Hat Linux))
	id 1LrOQI-0002YH-Ls
	for kyle at mcmartin.ca; Wed, 08 Apr 2009 03:26:05 +0000
Received: from ozlabs.org (localhost [127.0.0.1])
	by ozlabs.org (Postfix) with ESMTP id 83E68DE377
	for <kyle at mcmartin.ca>; Wed,  8 Apr 2009 13:25:47 +1000 (EST)
X-Original-To: linuxppc-dev at ozlabs.org
Delivered-To: linuxppc-dev at ozlabs.org
Received: from bilbo.ozlabs.org (bilbo.ozlabs.org [203.10.76.25])
	(using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits))
	(Client CN "bilbo.ozlabs.org",
	Issuer "CAcert Class 3 Root" (verified OK))
	by ozlabs.org (Postfix) with ESMTPS id 4A85CDDFB5
	for <linuxppc-dev at ozlabs.org>; Wed,  8 Apr 2009 13:25:29 +1000 (EST)
Received: from thor.ozlabs.ibm.com (localhost [127.0.0.1])
	by bilbo.ozlabs.org (Postfix) with ESMTP id 24C7BB6F3A;
	Wed,  8 Apr 2009 13:25:29 +1000 (EST)
Received: by thor.ozlabs.ibm.com (Postfix, from userid 500)
	id C994F50017; Wed,  8 Apr 2009 13:25:28 +1000 (EST)
To: <linux-kernel at vger.kernel.org>, Alan Cox <alan at lxorguk.ukuu.org.uk>
Message-Id: <aea82416ed6c6805412a2631fe8a8be6420c5c9d.1239161114.git.tony at bakeyournoodle.com>
From: Tony Breeds <tony at bakeyournoodle.com>
Subject: [PATCH] Fix build failure drivers/parport/parport_pc.c for powerpc
Date: Wed,  8 Apr 2009 13:25:28 +1000 (EST)
Cc: linuxppc-dev at ozlabs.org
X-BeenThere: linuxppc-dev at ozlabs.org
X-Mailman-Version: 2.1.11
Precedence: list
List-Id: Linux on PowerPC Developers Mail List <linuxppc-dev.ozlabs.org>
List-Unsubscribe: <https://ozlabs.org/mailman/options/linuxppc-dev>,
	<mailto:linuxppc-dev-request at ozlabs.org?subject=unsubscribe>
List-Archive: <http://ozlabs.org/pipermail/linuxppc-dev>
List-Post: <mailto:linuxppc-dev at ozlabs.org>
List-Help: <mailto:linuxppc-dev-request at ozlabs.org?subject=help>
List-Subscribe: <https://ozlabs.org/mailman/listinfo/linuxppc-dev>,
	<mailto:linuxppc-dev-request at ozlabs.org?subject=subscribe>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Sender: linuxppc-dev-bounces+kyle=mcmartin.ca at ozlabs.org
Errors-To: linuxppc-dev-bounces+kyle=mcmartin.ca at ozlabs.org

In commit 51dcdfec6a274afc1c6fce180d582add9ff512c0 (parport: Use the PCI
IRQ if offered) parport_pc_probe_port() gained an irqflags arg.  This
isn't being supplied on powerpc.  This patch make powerpc fallback to
the old behaviour, that is using "0" for irqflags.

Fixes build failure:
In file included from drivers/parport/parport_pc.c:68:
arch/powerpc/include/asm/parport.h: In function 'parport_pc_find_nonpci_ports':
arch/powerpc/include/asm/parport.h:32: error: too few arguments to function 'parport_pc_probe_port'
arch/powerpc/include/asm/parport.h:32: error: too few arguments to function 'parport_pc_probe_port'
arch/powerpc/include/asm/parport.h:32: error: too few arguments to function 'parport_pc_probe_port'
make[3]: *** [drivers/parport/parport_pc.o] Error 1

Signed-off-by: Tony Breeds <tony at bakeyournoodle.com>
---
 arch/powerpc/include/asm/parport.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/arch/powerpc/include/asm/parport.h b/arch/powerpc/include/asm/parport.h
index 414c50e..94942d6 100644
--- a/arch/powerpc/include/asm/parport.h
+++ b/arch/powerpc/include/asm/parport.h
@@ -29,7 +29,7 @@ static int __devinit parport_pc_find_nonpci_ports (int autoirq, int autodma)
 		prop = of_get_property(np, "interrupts", NULL);
 		if (!prop)
 			continue;
-		if (parport_pc_probe_port(io1, io2, prop[0], autodma, NULL) != NULL)
+		if (parport_pc_probe_port(io1, io2, prop[0], autodma, NULL, 0) != NULL)
 			count++;
 	}
 	return count;
-- 
1.6.0.6

_______________________________________________
Linuxppc-dev mailing list
Linuxppc-dev at ozlabs.org
https://ozlabs.org/mailman/listinfo/linuxppc-dev



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1515
retrieving revision 1.1516
diff -u -r1.1515 -r1.1516
--- kernel.spec	13 Apr 2009 04:02:16 -0000	1.1515
+++ kernel.spec	13 Apr 2009 04:57:15 -0000	1.1516
@@ -673,6 +673,7 @@
 # fs fixes
 Patch3000: linux-2.6-btrfs-experimental-branch.patch
 
+Patch9000: ppc-fix-parport_pc.patch
 Patch9002: cpufreq-add-atom-to-p4-clockmod.patch
 
 # http://bugs.freedesktop.org/show_bug.cgi?id=20803
@@ -1227,6 +1228,8 @@
 #ApplyPatch linux-2.6-v4l-dvb-experimental.patch
 #ApplyPatch linux-2.6-revert-dvb-net-kabi-change.patch
 
+ApplyPatch ppc-fix-parport_pc.patch
+
 #ApplyPatch cpufreq-add-atom-to-p4-clockmod.patch
 
 ApplyPatch linux-2.6.29-pat-fixes.patch
@@ -1825,6 +1828,9 @@
 #	                ||     ||
 %changelog
 * Mon Apr 13 2009 Kyle McMartin <kyle at redhat.com>
+- ppc-fix-parport_pc.patch: add from linuxppc-dev@
+
+* Mon Apr 13 2009 Kyle McMartin <kyle at redhat.com>
 - execshield: fix build (load_user_cs_desc is 32-bit only in tlb.c)
 
 * Sun Apr 12 2009 Kyle McMartin <kyle at redhat.com>