diff options
author | David S. Miller <davem@sunset.davemloft.net> | 2005-09-29 00:48:25 -0400 |
---|---|---|
committer | David S. Miller <davem@sunset.davemloft.net> | 2005-09-29 00:48:25 -0400 |
commit | ed3ffaf7b5e0262cb860f106a6632933671cc88f (patch) | |
tree | 5b5260e523d5383922cc90f539c1f31e664e78f6 /arch/sparc64 | |
parent | 10147570f9eaff3920f0c67bad7244c2eb958d4f (diff) |
[SPARC64]: Solidify check in cheetah_check_main_memory().
Need to make sure the address is below high_memory before
passing it to kern_addr_valid().
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64')
-rw-r--r-- | arch/sparc64/kernel/traps.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/sparc64/kernel/traps.c b/arch/sparc64/kernel/traps.c index eeb1e835c423..7f190fc57545 100644 --- a/arch/sparc64/kernel/traps.c +++ b/arch/sparc64/kernel/traps.c | |||
@@ -1333,6 +1333,9 @@ static int cheetah_check_main_memory(unsigned long paddr) | |||
1333 | { | 1333 | { |
1334 | unsigned long vaddr = PAGE_OFFSET + paddr; | 1334 | unsigned long vaddr = PAGE_OFFSET + paddr; |
1335 | 1335 | ||
1336 | if (vaddr > high_memory) | ||
1337 | return 0; | ||
1338 | |||
1336 | return kern_addr_valid(vaddr); | 1339 | return kern_addr_valid(vaddr); |
1337 | } | 1340 | } |
1338 | 1341 | ||