From 0cc88348b231dbe57d57c6c9bf1267615194e8d3 Mon Sep 17 00:00:00 2001 From: Gerhard Pircher Date: Fri, 23 Jan 2009 06:51:28 +0000 Subject: [PATCH] --- yaml --- r: 130371 b: refs/heads/master c: 4c456a67f501b8b15542c7c21c28812bf88f484b h: refs/heads/master i: 130369: 0046bda6fe6f2f0dffd5e6293f9c4ba1c6282238 130367: 24560e5881e33a218d5df44f92d90b8711460cbc v: v3 --- [refs] | 2 +- trunk/arch/powerpc/mm/ppc_mmu_32.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 65fa016885a5..1758449bb918 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 69b052e828b5ff32df7f96d6d3268a069910c663 +refs/heads/master: 4c456a67f501b8b15542c7c21c28812bf88f484b diff --git a/trunk/arch/powerpc/mm/ppc_mmu_32.c b/trunk/arch/powerpc/mm/ppc_mmu_32.c index 45d925360b89..fe65c405412c 100644 --- a/trunk/arch/powerpc/mm/ppc_mmu_32.c +++ b/trunk/arch/powerpc/mm/ppc_mmu_32.c @@ -123,9 +123,9 @@ void __init setbat(int index, unsigned long virt, phys_addr_t phys, int wimgxpp; struct ppc_bat *bat = BATS[index]; - if (((flags & _PAGE_NO_CACHE) == 0) && - cpu_has_feature(CPU_FTR_NEED_COHERENT)) - flags |= _PAGE_COHERENT; + if ((flags & _PAGE_NO_CACHE) || + (cpu_has_feature(CPU_FTR_NEED_COHERENT) == 0)) + flags &= ~_PAGE_COHERENT; bl = (size >> 17) - 1; if (PVR_VER(mfspr(SPRN_PVR)) != 1) {