rpms/kernel/devel linux-2.6-libata-pegasos-fix.patch, NONE, 1.1 kernel.spec, 1.412, 1.413

[Chuck Ebbert (cebbert)]

Author: cebbert

Update of /cvs/pkgs/rpms/kernel/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10907

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-libata-pegasos-fix.patch 
Log Message:
* Sun Feb 10 2008 Chuck Ebbert <cebbert at redhat.com>
- Fix PPC Pegasos libata again (#430802)


linux-2.6-libata-pegasos-fix.patch:

--- NEW FILE linux-2.6-libata-pegasos-fix.patch ---
>From olaf at aepfle.de Mon Jan 21 20:39:30 2008
From: Olaf Hering <olaf at aepfle.de>
Subject: revert chrp_pci_fixup_vt8231_ata devinit to fix libata on pegasos
Date: Mon, 21 Jan 2008 20:39:30 +1100
X-Patchwork-ID: 16281

commit 6d98bda79bea0e1be26c0767d0e9923ad3b72f2e changed the init order
for chrp_pci_fixup_vt8231_ata()
It can not work anymore because either the irq is not yet set to 14 or
pci_get_device() returns nothing. At least the printk() in
chrp_pci_fixup_vt8231_ata() does not trigger anymore.
pata_via works again on Pegasos with the change below.

Signed-off-by: Olaf Hering <olaf at aepfle.de>


---
--- a/arch/powerpc/platforms/chrp/pci.c
+++ b/arch/powerpc/platforms/chrp/pci.c
@@ -354,7 +354,7 @@ DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_WI
  * mode as well. The same fixup must be done to the class-code property in
  * the IDE node /pci at 80000000/ide at C,1
  */
-static void __devinit chrp_pci_fixup_vt8231_ata(struct pci_dev *viaide)
+static void chrp_pci_fixup_vt8231_ata(struct pci_dev *viaide)
 {
 	u8 progif;
 	struct pci_dev *viaisa;
@@ -375,4 +375,4 @@ static void __devinit chrp_pci_fixup_vt8
 
 	pci_dev_put(viaisa);
 }
-DECLARE_PCI_FIXUP_EARLY(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_1, chrp_pci_fixup_vt8231_ata);
+DECLARE_PCI_FIXUP_FINAL(PCI_VENDOR_ID_VIA, PCI_DEVICE_ID_VIA_82C586_1, chrp_pci_fixup_vt8231_ata);



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.412
retrieving revision 1.413
diff -u -r1.412 -r1.413
--- kernel.spec	10 Feb 2008 21:20:32 -0000	1.412
+++ kernel.spec	11 Feb 2008 00:35:29 -0000	1.413
@@ -624,6 +624,7 @@
 Patch590: linux-2.6-unexport-symbols.patch
 Patch610: linux-2.6-defaults-fat-utf8.patch
 Patch660: linux-2.6-libata-ali-atapi-dma.patch
+Patch661: linux-2.6-libata-pegasos-fix.patch
 Patch670: linux-2.6-ata-quirk.patch
 
 Patch680: linux-2.6-wireless.patch
@@ -1158,6 +1159,8 @@
 
 # Disable ATAPI DMA on ALI chipsets.
 ApplyPatch linux-2.6-libata-ali-atapi-dma.patch
+# fix pegasos *again* (#430802)
+ApplyPatch linux-2.6-libata-pegasos-fix.patch
 # ia64 ata quirk
 ApplyPatch linux-2.6-ata-quirk.patch
 
@@ -1802,6 +1805,9 @@
 %kernel_variant_files -a /%{image_install_path}/xen*-%{KVERREL} -e /etc/ld.so.conf.d/kernelcap-%{KVERREL}.conf %{with_xen} xen
 
 %changelog
+* Sun Feb 10 2008 Chuck Ebbert <cebbert at redhat.com>
+- Fix PPC Pegasos libata again (#430802)
+
 * Sun Feb 10 2008 Dave Airlie <airlied at redhat.com>
 - CVE-2008-0600 - remote root vulnerability in vmsplice