diff options
| author | David S. Miller <davem@davemloft.net> | 2012-02-10 23:32:28 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2012-02-10 23:32:28 -0500 |
| commit | d5ef8a4d87ab21d575ac86366599c9152a28028d (patch) | |
| tree | 8b1be85ad1af7ee6a0e3e36c77ae738c966c1f21 /arch/arm/mm | |
| parent | d9dd966d7fc088a6bed991c2b1e2fba4485e0a31 (diff) | |
| parent | 8df54d622a120058ee8bec38743c9b8f091c8e58 (diff) | |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
drivers/infiniband/hw/nes/nes_cm.c
Simple whitespace conflict.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/arm/mm')
| -rw-r--r-- | arch/arm/mm/ioremap.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mm/ioremap.c b/arch/arm/mm/ioremap.c index ba159370fa5f..80632e8d7538 100644 --- a/arch/arm/mm/ioremap.c +++ b/arch/arm/mm/ioremap.c @@ -225,8 +225,7 @@ void __iomem * __arm_ioremap_pfn_caller(unsigned long pfn, if ((area->flags & VM_ARM_MTYPE_MASK) != VM_ARM_MTYPE(mtype)) continue; if (__phys_to_pfn(area->phys_addr) > pfn || - __pfn_to_phys(pfn) + offset + size-1 > - area->phys_addr + area->size-1) + __pfn_to_phys(pfn) + size-1 > area->phys_addr + area->size-1) continue; /* we can drop the lock here as we know *area is static */ read_unlock(&vmlist_lock); |