Fix a typo in pSeries_lpar_hpte_insert()
Signed-off-by: Denis Kirjanov <redacted>
---
arch/powerpc/platforms/pseries/lpar.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c
index 0da39fe..c4112ed 100644
--- a/arch/powerpc/platforms/pseries/lpar.c
+++ b/arch/powerpc/platforms/pseries/lpar.c
@@ -136,7 +136,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;
--
1.8.0.2
Denis Kirjanov [off-list ref] writes:
Fix a typo in pSeries_lpar_hpte_insert()
Signed-off-by: Denis Kirjanov <redacted>
looks good
Reviewed-by: Aneesh Kumar K.V <redacted>
We may want to add the commit that introduced the change ?
801eb73f45371accc78ca9d6d22d647eeb722c11
quoted hunk
---
arch/powerpc/platforms/pseries/lpar.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c
index 0da39fe..c4112ed 100644
--- a/arch/powerpc/platforms/pseries/lpar.c
+++ b/arch/powerpc/platforms/pseries/lpar.c
@@ -136,7 +136,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;
--
1.8.0.2
On Mon, Jul 22, 2013 at 08:54:31PM +0530, Aneesh Kumar K.V wrote:
Denis Kirjanov [off-list ref] writes:
quoted
Fix a typo in pSeries_lpar_hpte_insert()
Signed-off-by: Denis Kirjanov <redacted>
looks good
Reviewed-by: Aneesh Kumar K.V <redacted>
We may want to add the commit that introduced the change ?
801eb73f45371accc78ca9d6d22d647eeb722c11
Yes, as well as describe what the typo is, and what the implications
are - ie. what was broken and is now fixed.
cheers