Commit 6806bfe1 authored by Greg Ungerer's avatar Greg Ungerer Committed by Russell King

ARM: 5740/1: fix valid_phys_addr_range() range check

Commit 1522ac3e
("Fix virtual to physical translation macro corner cases")
breaks the end of memory check in valid_phys_addr_range().
The modified expression results in the apparent /dev/mem size
being 2 bytes smaller than what it actually is.

This patch reworks the expression to correctly check the address,
while maintaining use of a valid address to __pa().
Signed-off-by: default avatarGreg Ungerer <gerg@uclinux.org>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 31abdb74
...@@ -124,7 +124,7 @@ int valid_phys_addr_range(unsigned long addr, size_t size) ...@@ -124,7 +124,7 @@ int valid_phys_addr_range(unsigned long addr, size_t size)
{ {
if (addr < PHYS_OFFSET) if (addr < PHYS_OFFSET)
return 0; return 0;
if (addr + size >= __pa(high_memory - 1)) if (addr + size > __pa(high_memory - 1) + 1)
return 0; return 0;
return 1; return 1;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment