rpms/kernel/devel sata_sil-build-break-fix.patch, NONE, 1.1 kernel.spec, 1.1242, 1.1243

[Kyle McMartin]

Author: kyle

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

Modified Files:
	kernel.spec 
Added Files:
	sata_sil-build-break-fix.patch 
Log Message:
* Wed Jan 28 2009 Kyle McMartin <kyle at redhat.com>
- sata_sil-build-break-fix.patch: fix use of DMI.


sata_sil-build-break-fix.patch:

--- NEW FILE sata_sil-build-break-fix.patch ---
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

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo at vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/



Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.1242
retrieving revision 1.1243
diff -u -r1.1242 -r1.1243
--- kernel.spec	28 Jan 2009 19:40:41 -0000	1.1242
+++ kernel.spec	28 Jan 2009 20:06:23 -0000	1.1243
@@ -682,6 +682,9 @@
 # Hook up proper selinux bits for btrfs
 Patch9003: linux-2.6.29-btrfs-selinux.patch
 
+# build horkage fix.
+Patch9100: sata_sil-build-break-fix.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1197,6 +1200,9 @@
 # turn off intel_iommu by default
 #  bugs: #481356, #479996
 ApplyPatch linux-2.6-defaults-intel_iommu-off.patch
+
+ApplyPatch sata_sil-build-break-fix.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1773,6 +1779,9 @@
 
 %changelog
 * Wed Jan 28 2009 Kyle McMartin <kyle at redhat.com>
+- sata_sil-build-break-fix.patch: fix use of DMI.
+
+* Wed Jan 28 2009 Kyle McMartin <kyle at redhat.com>
 - Linux 2.6.29-rc3
 
 * Wed Jan 28 2009 Kyle McMartin <kyle at redhat.com>