diff options
author | Arnaud Patard <apatard@mandriva.com> | 2010-04-29 11:58:49 +0200 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2010-04-30 20:52:51 +0100 |
commit | 514b6d0c06a5d751259f145d9593b4d084c1cce3 (patch) | |
tree | 2393ab9df49dfaa005e06ec88cbfe9452fe9bd5e | |
parent | ff40ad72addb448c1285181820597a17685ee69a (diff) | |
download | linux-stable-514b6d0c06a5d751259f145d9593b4d084c1cce3.tar.gz linux-stable-514b6d0c06a5d751259f145d9593b4d084c1cce3.tar.bz2 linux-stable-514b6d0c06a5d751259f145d9593b4d084c1cce3.zip |
MIPS: Loongson: Fix phys_mem_access_prot() check
The check used to determine if uncached accelerated should be used or not
is wrong. The parenthesis are misplaced and making the test fail.
Signed-off-by: Arnaud Patard <apatard@mandriva.com>
To: linux-mips@linux-mips.org
Patchwork: http://patchwork.linux-mips.org/patch/1161/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r-- | arch/mips/loongson/common/mem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/loongson/common/mem.c b/arch/mips/loongson/common/mem.c index b5f402578a87..30eba6001205 100644 --- a/arch/mips/loongson/common/mem.c +++ b/arch/mips/loongson/common/mem.c @@ -75,7 +75,7 @@ pgprot_t phys_mem_access_prot(struct file *file, unsigned long pfn, unsigned long end = offset + size; if (__uncached_access(file, offset)) { - if (((uca_start && offset) >= uca_start) && + if (uca_start && (offset >= uca_start) && (end <= uca_end)) return __pgprot((pgprot_val(vma_prot) & ~_CACHE_MASK) | |