From cd36f4f587d09af51ae719e43c4cd17e79d0d5c6 Mon Sep 17 00:00:00 2001 From: Arnaud Patard Date: Thu, 29 Apr 2010 11:58:49 +0200 Subject: [PATCH] --- yaml --- r: 190507 b: refs/heads/master c: 514b6d0c06a5d751259f145d9593b4d084c1cce3 h: refs/heads/master i: 190505: b5ee5ead6922b9a9047d3f27273e0526c6be6164 190503: f1e52141595eadf131ff150d79b04896bb25e4b8 v: v3 --- [refs] | 2 +- trunk/arch/mips/loongson/common/mem.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 68bdd74624ea..d953b797fd7a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: ff40ad72addb448c1285181820597a17685ee69a +refs/heads/master: 514b6d0c06a5d751259f145d9593b4d084c1cce3 diff --git a/trunk/arch/mips/loongson/common/mem.c b/trunk/arch/mips/loongson/common/mem.c index b5f402578a87..30eba6001205 100644 --- a/trunk/arch/mips/loongson/common/mem.c +++ b/trunk/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) |