aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2008-10-30 18:31:27 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2008-10-30 18:31:27 -0700
commit43908195e04ee27779a60c55b5bb47aebf1c46ae (patch)
tree8f60144840b81677ce195e6ddf09b78fd8078226
parent7105212bd309752b589a3ba816afdd7fed190b85 (diff)
parentd68612b257b5f4ea2e6535859c5a26b10011a9df (diff)
Merge branch 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'core-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: resources: fix x86info results ioremap.c:226 __ioremap_caller+0xf2/0x2d6() WARNINGs
-rw-r--r--kernel/resource.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/kernel/resource.c b/kernel/resource.c
index 7fec0e42723..6aac5c60b25 100644
--- a/kernel/resource.c
+++ b/kernel/resource.c
@@ -17,6 +17,7 @@
#include <linux/proc_fs.h>
#include <linux/seq_file.h>
#include <linux/device.h>
+#include <linux/pfn.h>
#include <asm/io.h>
@@ -849,7 +850,8 @@ int iomem_map_sanity_check(resource_size_t addr, unsigned long size)
continue;
if (p->end < addr)
continue;
- if (p->start <= addr && (p->end >= addr + size - 1))
+ if (PFN_DOWN(p->start) <= PFN_DOWN(addr) &&
+ PFN_DOWN(p->end) >= PFN_DOWN(addr + size - 1))
continue;
printk(KERN_WARNING "resource map sanity check conflict: "
"0x%llx 0x%llx 0x%llx 0x%llx %s\n",