rpms/kernel/devel linux-2.6-quiet-iommu.patch, NONE, 1.1 kernel.spec, 1.904, 1.905

[Adam Jackson]

Author: ajax

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

Modified Files:
	kernel.spec 
Added Files:
	linux-2.6-quiet-iommu.patch 
Log Message:
* Tue Aug 26 2008 Adam Jackson <ajax at redhat.com>
- Silence the IOMMU warnings, since pretty much no BIOS has the options to
  fix them anyway.


linux-2.6-quiet-iommu.patch:

--- NEW FILE linux-2.6-quiet-iommu.patch ---
diff -up linux-2.6.26.noarch/arch/x86/kernel/aperture_64.c.jx linux-2.6.26.noarch/arch/x86/kernel/aperture_64.c
--- linux-2.6.26.noarch/arch/x86/kernel/aperture_64.c.jx	2008-08-26 17:08:04.000000000 -0400
+++ linux-2.6.26.noarch/arch/x86/kernel/aperture_64.c	2008-08-26 17:23:47.000000000 -0400
@@ -455,11 +455,11 @@ out:
 		   force_iommu ||
 		   valid_agp ||
 		   fallback_aper_force) {
-		printk(KERN_ERR
+		printk(KERN_INFO
 			"Your BIOS doesn't leave a aperture memory hole\n");
-		printk(KERN_ERR
+		printk(KERN_INFO
 			"Please enable the IOMMU option in the BIOS setup\n");
-		printk(KERN_ERR
+		printk(KERN_INFO
 			"This costs you %d MB of RAM\n",
 				32 << fallback_aper_order);
 
diff -up linux-2.6.26.noarch/include/asm-x86/gart.h.jx linux-2.6.26.noarch/include/asm-x86/gart.h
--- linux-2.6.26.noarch/include/asm-x86/gart.h.jx	2008-08-26 17:08:21.000000000 -0400
+++ linux-2.6.26.noarch/include/asm-x86/gart.h	2008-08-26 17:29:04.000000000 -0400
@@ -52,15 +52,15 @@ static inline int aperture_valid(u64 ape
 		return 0;
 
 	if (aper_base + aper_size > 0x100000000ULL) {
-		printk(KERN_ERR "Aperture beyond 4GB. Ignoring.\n");
+		printk(KERN_INFO "Aperture beyond 4GB. Ignoring.\n");
 		return 0;
 	}
 	if (e820_any_mapped(aper_base, aper_base + aper_size, E820_RAM)) {
-		printk(KERN_ERR "Aperture pointing to e820 RAM. Ignoring.\n");
+		printk(KERN_INFO "Aperture pointing to e820 RAM. Ignoring.\n");
 		return 0;
 	}
 	if (aper_size < min_size) {
-		printk(KERN_ERR "Aperture too small (%d MB) than (%d MB)\n",
+		printk(KERN_INFO "Aperture too small (%d MB) than (%d MB)\n",
 				 aper_size>>20, min_size>>20);
 		return 0;
 	}


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/devel/kernel.spec,v
retrieving revision 1.904
retrieving revision 1.905
diff -u -r1.904 -r1.905
--- kernel.spec	26 Aug 2008 14:21:34 -0000	1.904
+++ kernel.spec	26 Aug 2008 21:35:51 -0000	1.905
@@ -635,6 +635,8 @@
 # Quiet boot fixes
 # silence piix3 in quiet boot (ie, qemu)
 Patch2800: linux-2.6-piix3-silence-quirk.patch
+# Hush IOMMU warnings, you typically can't fix them anyway
+Patch2801: linux-2.6-quiet-iommu.patch
 # silence the ACPI blacklist code
 Patch2802: linux-2.6-silence-acpi-blacklist.patch
 
@@ -1162,6 +1164,8 @@
 
 # silence piix3 in quiet boot (ie, qemu)
 ApplyPatch linux-2.6-piix3-silence-quirk.patch
+# Hush IOMMU warnings, you typically can't fix them anyway
+ApplyPatch linux-2.6-quiet-iommu.patch
 # silence the ACPI blacklist code
 ApplyPatch linux-2.6-silence-acpi-blacklist.patch
 
@@ -1739,6 +1743,10 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Tue Aug 26 2008 Adam Jackson <ajax at redhat.com>
+- Silence the IOMMU warnings, since pretty much no BIOS has the options to
+  fix them anyway.
+
 * Tue Aug 26 2008 Jarod Wilson <jarod at redhat.com>
 - Temporarily turn on CONFIG_SYSFS_DEPRECATED{,_V2} for ia64