rpms/kernel/F-12 kernel.spec, 1.1922, 1.1923 linux-2.6-iommu-at-zero.patch, 1.1, 1.2

[David Woodhouse]

Author: dwmw2

Update of /cvs/pkgs/rpms/kernel/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3023

Modified Files:
	kernel.spec linux-2.6-iommu-at-zero.patch 
Log Message:
Please don't hurt me.


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/kernel.spec,v
retrieving revision 1.1922
retrieving revision 1.1923
diff -u -p -r1.1922 -r1.1923
--- kernel.spec	17 Nov 2009 20:14:13 -0000	1.1922
+++ kernel.spec	18 Nov 2009 10:26:45 -0000	1.1923
@@ -2128,6 +2128,9 @@ fi
 # and build.
 
 %changelog
+* Wed Nov 18 2009 David Woodhouse <David.Woodhouse at intel.com> 2.6.31.6-137
+- Actually force the IOMMU not to be used when we detect the HP/Acer bug.
+
 * Tue Nov 17 2009 Chuck Ebbert <cebbert at redhat.com> 2.6.31.6-136
 - ACPI embedded controller fixes from Fedora 11.
 

linux-2.6-iommu-at-zero.patch:
 dmar.c |   50 ++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 40 insertions(+), 10 deletions(-)

Index: linux-2.6-iommu-at-zero.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-12/linux-2.6-iommu-at-zero.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- linux-2.6-iommu-at-zero.patch	8 Nov 2009 01:44:40 -0000	1.1
+++ linux-2.6-iommu-at-zero.patch	18 Nov 2009 10:26:46 -0000	1.2
@@ -18,7 +18,7 @@ index 22b02c6..e5f8fc1 100644
  	dmaru = kzalloc(sizeof(*dmaru), GFP_KERNEL);
  	if (!dmaru)
  		return -ENOMEM;
-@@ -591,12 +582,50 @@ int __init dmar_table_init(void)
+@@ -591,12 +582,51 @@ int __init dmar_table_init(void)
  	return 0;
  }
  
@@ -49,6 +49,7 @@ index 22b02c6..e5f8fc1 100644
 +				     dmi_get_system_info(DMI_BIOS_VENDOR),
 +				     dmi_get_system_info(DMI_BIOS_VERSION),
 +				     dmi_get_system_info(DMI_PRODUCT_VERSION));
++				dmar_disabled = 1;
 +				return 0;
 +			}
 +			break;