Fix a typo in pSeries_lpar_hpte_insert()

PATCH New Denis Kirjanov 1 participant 1 message Jul 23, 2013 PowerPC

Share & tools

Denis Kirjanov

author

2013-07-23 15:23 UTC #0 lore raw

PATCH v2 1/1 Fix a typo in pSeries_lpar_hpte_insert()

Commit 801eb73f45371accc78ca9d6d22d647eeb722c11 introduced
a bug while checking PTE flags. We have to drop the _PAGE_COHERENT flag when __PAGE_NO_CACHE is set and the cache update policy is not write-through (i.e. _PAGE_WRITETHRU is not set)

Signed-off-by Denis Kirjanov <[email protected]>

Reviewed-by Aneesh Kumar K.V <[email protected]>

CC Michael Ellerman <[email protected]>

---
v1->v2:
- Updated commit log

---
 arch/powerpc/platforms/pseries/lpar.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

arch/powerpc/platforms/pseries/lpar.c +1 -1

index 02d6e21..8bad880 100644
@@ -146,7 +146,7 @@ static long pSeries_lpar_hpte_insert(unsigned long hpte_group,
 	flags = 0;
 
 	/* Make pHyp happy */
-	if ((rflags & _PAGE_NO_CACHE) & !(rflags & _PAGE_WRITETHRU))
+	if ((rflags & _PAGE_NO_CACHE) && !(rflags & _PAGE_WRITETHRU))
 		hpte_r &= ~_PAGE_COHERENT;
 	if (firmware_has_feature(FW_FEATURE_XCMO) && !(hpte_r & HPTE_R_N))
 		flags |= H_COALESCE_CAND;

Signature · 1 line

1.8.0.2