rpms/kernel/devel kernel.spec, 1.1254, 1.1255 linux-2.6-compile-fixes.patch, 1.188, 1.189 sata_sil-build-break-fix.patch, 1.1, NONE

[Chuck Ebbert]

Author: cebbert

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

Modified Files:
	kernel.spec linux-2.6-compile-fixes.patch 
Removed Files:
	sata_sil-build-break-fix.patch 
Log Message:
Fold sata_sil build fix into compile-fixes.patch


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1254
retrieving revision 1.1255
diff -u -r1.1254 -r1.1255
--- kernel.spec	1 Feb 2009 01:48:03 -0000	1.1254
+++ kernel.spec	1 Feb 2009 05:35:59 -0000	1.1255
@@ -685,9 +685,6 @@
 # Fix readdir for 32bit boxes in btrfs
 Patch9005: linux-2.6.29-btrfs-readdir-fix.patch
 
-# build horkage fix.
-Patch9100: sata_sil-build-break-fix.patch
-
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1203,8 +1200,6 @@
 #  bugs: #481356, #479996
 ApplyPatch linux-2.6-defaults-intel_iommu-off.patch
 
-ApplyPatch sata_sil-build-break-fix.patch
-
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1780,6 +1775,9 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Sun Feb 01 2009 Chuck Ebbert <cebbert at redhat.com>
+- Fold sata_sil build fix into compile-fixes.patch
+
 * Sat Jan 31 2009 Dave Jones <davej at redhat.com>
 - 2.6.29-rc3-git3
 

linux-2.6-compile-fixes.patch:

Index: linux-2.6-compile-fixes.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/linux-2.6-compile-fixes.patch,v
retrieving revision 1.188
retrieving revision 1.189
diff -u -r1.188 -r1.189
--- linux-2.6-compile-fixes.patch	1 Feb 2009 01:48:03 -0000	1.188
+++ linux-2.6-compile-fixes.patch	1 Feb 2009 05:36:00 -0000	1.189
@@ -5,3 +5,48 @@
 # to do a compile to figure out what your diff is fixing. Thanks.
 #
 
+From:	Kumar Gala <galak at kernel.crashing.org>
+Subject: [PATCH] sata_sil: Fix build breakage
+Date:	Tue, 27 Jan 2009 23:02:02 -0600
+
+The following commit introduces:
+
+commit e57db7bde7bff95ae812736ca00c73bd5271455b
+Author: Rafael J. Wysocki <rjw at sisk.pl>
+Date:   Mon Jan 19 20:58:29 2009 +0100
+
+    SATA Sil: Blacklist system that spins off disks during ACPI power off
+
+the following build errors on non-x86 systems:
+
+drivers/ata/sata_sil.c: In function 'sil_broken_system_poweroff':
+drivers/ata/sata_sil.c:713: error: implicit declaration of function 'dmi_first_match'
+drivers/ata/sata_sil.c:713: warning: initialization makes pointer from integer without a cast
+
+Signed-off-by: Kumar Gala <galak at kernel.crashing.org>
+---
+ drivers/ata/sata_sil.c |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/drivers/ata/sata_sil.c b/drivers/ata/sata_sil.c
+index bfd55b0..3f0549d 100644
+--- a/drivers/ata/sata_sil.c
++++ b/drivers/ata/sata_sil.c
+@@ -697,6 +697,7 @@ static void sil_init_controller(struct ata_host *host)
+ 
+ static bool sil_broken_system_poweroff(struct pci_dev *pdev)
+ {
++#ifdef CONFIG_DMI
+ 	static const struct dmi_system_id broken_systems[] = {
+ 		{
+ 			.ident = "HP Compaq nx6325",
+@@ -717,6 +718,7 @@ static bool sil_broken_system_poweroff(struct pci_dev *pdev)
+ 		/* apply the quirk only to on-board controllers */
+ 		return slot == PCI_SLOT(pdev->devfn);
+ 	}
++#endif
+ 
+ 	return false;
+ }
+-- 
+1.5.6.6


--- sata_sil-build-break-fix.patch DELETED ---