diff --git a/[refs] b/[refs] index 9e50f798d649..e46568263cd2 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c710e39cbec4f3d60acd07f5356404a61bc1959a +refs/heads/master: 9ae3ae0bebb9a3a348dc233229008b126014889d diff --git a/trunk/arch/arm/mm/mmap.c b/trunk/arch/arm/mm/mmap.c index 2728b0e7d2bb..3f6dc40b8353 100644 --- a/trunk/arch/arm/mm/mmap.c +++ b/trunk/arch/arm/mm/mmap.c @@ -120,6 +120,8 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr, */ 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;