rpms/kernel/F-10 skip-sanity-check-of-busy-resources.patch, NONE, 1.1 kernel.spec, 1.1230, 1.1231

[Kyle McMartin]

Author: kyle

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

Modified Files:
	kernel.spec 
Added Files:
	skip-sanity-check-of-busy-resources.patch 
Log Message:
* Mon Jan 26 2009 Kyle McMartin <kyle at redhat.com> 2.6.28.2-24
- add skip-sanity-check-of-busy-resources.patch, fixes #480700, ioremap
  sanity check WARN_ON due to acpi ec.
  3ac52669c7a24b93663acfcab606d1065ed1accd upstream.


skip-sanity-check-of-busy-resources.patch:

--- NEW FILE skip-sanity-check-of-busy-resources.patch ---
commit 3ac52669c7a24b93663acfcab606d1065ed1accd
Author: Arjan van de Ven <arjan at linux.intel.com>
Date:   Sat Dec 13 09:15:27 2008 -0800

    resources: skip sanity check of busy resources
    
    Impact: reduce false positives in iomem_map_sanity_check()
    
    Some drivers (vesafb) only map/reserve a portion of a resource.
    If then some other driver comes in and maps the whole resource,
    the current code WARN_ON's. This is not the intent of the checks
    in iomem_map_sanity_check(); rather these checks want to
    warn when crossing *hardware* resources only.
    
    This patch skips BUSY resources as suggested by Linus.
    
    Note: having two drivers talk to the same hardware at the same
    time is obviously not optimal behavior, but that's a separate story.
    
    Signed-off-by: Arjan van de Ven <arjan at linux.intel.com>
    Signed-off-by: Ingo Molnar <mingo at elte.hu>

diff --git a/kernel/resource.c b/kernel/resource.c
index 4337063..e633106 100644
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -853,6 +853,15 @@ int iomem_map_sanity_check(resource_size_t addr, unsigned long size)
 		if (PFN_DOWN(p->start) <= PFN_DOWN(addr) &&
 		    PFN_DOWN(p->end) >= PFN_DOWN(addr + size - 1))
 			continue;
+		/*
+		 * if a resource is "BUSY", it's not a hardware resource
+		 * but a driver mapping of such a resource; we don't want
+		 * to warn for those; some drivers legitimately map only
+		 * partial hardware resources. (example: vesafb)
+		 */
+		if (p->flags & IORESOURCE_BUSY)
+			continue;
+
 		printk(KERN_WARNING "resource map sanity check conflict: "
 		       "0x%llx 0x%llx 0x%llx 0x%llx %s\n",
 		       (unsigned long long)addr,


Index: kernel.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kernel/F-10/kernel.spec,v
retrieving revision 1.1230
retrieving revision 1.1231
diff -u -r1.1230 -r1.1231
--- kernel.spec	26 Jan 2009 21:13:29 -0000	1.1230
+++ kernel.spec	27 Jan 2009 03:54:02 -0000	1.1231
@@ -680,6 +680,8 @@
 # ui
 Patch3130: disable-p4-cpufreq-ui.patch
 
+Patch9000: skip-sanity-check-of-busy-resources.patch
+
 %endif
 
 BuildRoot: %{_tmppath}/kernel-%{KVERREL}-root
@@ -1206,6 +1208,9 @@
 
 ApplyPatch disable-p4-cpufreq-ui.patch
 
+# fix #480700, acpi ec ioremap WARN_ON
+ApplyPatch skip-sanity-check-of-busy-resources.patch
+
 # END OF PATCH APPLICATIONS
 
 %endif
@@ -1782,6 +1787,11 @@
 %kernel_variant_files -k vmlinux %{with_kdump} kdump
 
 %changelog
+* Mon Jan 26 2009 Kyle McMartin <kyle at redhat.com> 2.6.28.2-24
+- add skip-sanity-check-of-busy-resources.patch, fixes #480700, ioremap
+  sanity check WARN_ON due to acpi ec.
+  3ac52669c7a24b93663acfcab606d1065ed1accd upstream.
+
 * Mon Jan 26 2009 Kyle McMartin <kyle at redhat.com> 2.6.28.2-22
 - 2.6.28.2 final