diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2009-03-24 18:47:45 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2009-03-24 18:47:45 -0400 |
| commit | fbf2b1f9cfdb4e4b5d042839142ed19ff5d46679 (patch) | |
| tree | 3a17c02aa0cf9bdbed9aa479739974aa2416ecac /arch/arm/mm/mmap.c | |
| parent | 9a38e989b8ce04923f919fc2a8a24eb07fb484e2 (diff) | |
| parent | 053a96ca11a9785a7e63fc89eed4514a6446ec58 (diff) | |
Merge branch 'highmem' into devel
Diffstat (limited to 'arch/arm/mm/mmap.c')
| -rw-r--r-- | arch/arm/mm/mmap.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mm/mmap.c b/arch/arm/mm/mmap.c index 5358fcc7f61e..f7457fea6de8 100644 --- a/arch/arm/mm/mmap.c +++ b/arch/arm/mm/mmap.c | |||
| @@ -124,7 +124,7 @@ int valid_phys_addr_range(unsigned long addr, size_t size) | |||
| 124 | { | 124 | { |
| 125 | if (addr < PHYS_OFFSET) | 125 | if (addr < PHYS_OFFSET) |
| 126 | return 0; | 126 | return 0; |
| 127 | if (addr + size > __pa(high_memory)) | 127 | if (addr + size >= __pa(high_memory - 1)) |
| 128 | return 0; | 128 | return 0; |
| 129 | 129 | ||
| 130 | return 1; | 130 | return 1; |