diff options
Diffstat (limited to 'arch/arm/mm/mmap.c')
-rw-r--r-- | arch/arm/mm/mmap.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c index 0c6356255fe3..d27158c38eb0 100644 --- a/arch/arm/mm/mmap.c +++ b/arch/arm/mm/mmap.c | |||
@@ -202,13 +202,11 @@ int valid_phys_addr_range(phys_addr_t addr, size_t size) | |||
202 | } | 202 | } |
203 | 203 | ||
204 | /* | 204 | /* |
205 | * We don't use supersection mappings for mmap() on /dev/mem, which | 205 | * Do not allow /dev/mem mappings beyond the supported physical range. |
206 | * means that we can't map the memory area above the 4G barrier into | ||
207 | * userspace. | ||
208 | */ | 206 | */ |
209 | int valid_mmap_phys_addr_range(unsigned long pfn, size_t size) | 207 | int valid_mmap_phys_addr_range(unsigned long pfn, size_t size) |
210 | { | 208 | { |
211 | return !(pfn + (size >> PAGE_SHIFT) > 0x00100000); | 209 | return (pfn + (size >> PAGE_SHIFT)) <= (1 + (PHYS_MASK >> PAGE_SHIFT)); |
212 | } | 210 | } |
213 | 211 | ||
214 | #ifdef CONFIG_STRICT_DEVMEM | 212 | #ifdef CONFIG_STRICT_DEVMEM |