diff options
author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-05-09 03:29:27 +0200 |
---|---|---|
committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2009-05-09 03:29:27 +0200 |
commit | d585a021c0b10b0477d6b608c53e1feb8cde0507 (patch) | |
tree | 5ca059da1db7f15d4b29427644ad9c08270c885c /arch/arm/mm/mmap.c | |
parent | Input: wm97xx - do not access dev->driver_data directly (diff) | |
parent | Linux 2.6.30-rc5 (diff) | |
download | linux-d585a021c0b10b0477d6b608c53e1feb8cde0507.tar.xz linux-d585a021c0b10b0477d6b608c53e1feb8cde0507.zip |
Merge commit 'v2.6.30-rc5' into next
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) { if (addr < PHYS_OFFSET) return 0; - if (addr + size > __pa(high_memory)) + if (addr + size >= __pa(high_memory - 1)) return 0; return 1; |