Merge branch 'next'

[linux-2.6-omap-h63xx.git] / arch / powerpc / platforms / cell / beat_htab.c

diff --git a/arch/powerpc/platforms/cell/beat_htab.c b/arch/powerpc/platforms/cell/beat_htab.c
index 81467ff055c8313152862f02eb8d828d3f349951..2e67bd840e011f6b10a284441c83ea2ac467dde7 100644 (file)
--- a/arch/powerpc/platforms/cell/beat_htab.c
+++ b/arch/powerpc/platforms/cell/beat_htab.c
@@ -112,7 +112,7 @@ static long beat_lpar_hpte_insert(unsigned long hpte_group,
        if (!(vflags & HPTE_V_BOLTED))
                DBG_LOW(" hpte_v=%016lx, hpte_r=%016lx\n", hpte_v, hpte_r);
 
-       if (rflags & (_PAGE_GUARDED|_PAGE_NO_CACHE))
+       if (rflags & _PAGE_NO_CACHE)
                hpte_r &= ~_PAGE_COHERENT;
 
        spin_lock(&beat_htab_lock);
@@ -334,7 +334,7 @@ static long beat_lpar_hpte_insert_v3(unsigned long hpte_group,
        if (!(vflags & HPTE_V_BOLTED))
                DBG_LOW(" hpte_v=%016lx, hpte_r=%016lx\n", hpte_v, hpte_r);
 
-       if (rflags & (_PAGE_GUARDED|_PAGE_NO_CACHE))
+       if (rflags & _PAGE_NO_CACHE)
                hpte_r &= ~_PAGE_COHERENT;
 
        /* insert into not-volted entry */