Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 43908195 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'core-fixes-for-linus' of... 

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
parents 7105212b d68612b2

kernel/resource.c

+3 −1
Original line number Diff line number Diff line
@@ -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",