diff options
author | Paul Mackerras <paulus@samba.org> | 2008-03-03 11:31:09 +0100 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2008-03-03 11:31:09 +0100 |
commit | 3cecdda3f169f22f324f78fd544beee68e3cc6a4 (patch) | |
tree | e7c2995ddc2690d1be695a1525bcd16d3965548d /arch/arm/mm/mmap.c | |
parent | Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jk/spu... (diff) | |
parent | [POWERPC] Convert the cell IOMMU fixed mapping to 16M IOMMU pages (diff) | |
download | linux-3cecdda3f169f22f324f78fd544beee68e3cc6a4.tar.xz linux-3cecdda3f169f22f324f78fd544beee68e3cc6a4.zip |
Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/arnd/cell-2.6 into merge
Diffstat (limited to 'arch/arm/mm/mmap.c')
-rw-r--r-- | arch/arm/mm/mmap.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c index 2728b0e7d2bb..3f6dc40b8353 100644 --- a/arch/arm/mm/mmap.c +++ b/arch/arm/mm/mmap.c @@ -120,6 +120,8 @@ full_search: */ int valid_phys_addr_range(unsigned long addr, size_t size) { + if (addr < PHYS_OFFSET) + return 0; if (addr + size > __pa(high_memory)) return 0; |