diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2013-01-30 00:58:26 (GMT)
committerLinus Torvalds <torvalds@linux-foundation.org>2013-01-30 00:58:26 (GMT)
commit8e5d573a6acfb129513cc929a731eeae37eddeee (patch)
parentd6a3bf93d69aefa2d81b64ece799799f44acd925 (diff)
parentbe3286507dab888d4aad9f91fd6ff5202b24cd5b (diff)
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux
Pull one s390 fix from Martin Schwidefsky: "Another transparent huge page fix, we need to define a s390 variant for pmdp_set_wrprotect to flush the TLB for the huge page correctly." * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux: s390/thp: implement pmdp_set_wrprotect()
1 files changed, 12 insertions, 0 deletions
diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h
index c1d7930..098adbb 100644
--- a/arch/s390/include/asm/pgtable.h
+++ b/arch/s390/include/asm/pgtable.h
@@ -1365,6 +1365,18 @@ static inline void pmdp_invalidate(struct vm_area_struct *vma,
__pmd_idte(address, pmdp);
+static inline void pmdp_set_wrprotect(struct mm_struct *mm,
+ unsigned long address, pmd_t *pmdp)
+ pmd_t pmd = *pmdp;
+ if (pmd_write(pmd)) {
+ __pmd_idte(address, pmdp);
+ set_pmd_at(mm, address, pmdp, pmd_wrprotect(pmd));
+ }
static inline pmd_t mk_pmd_phys(unsigned long physpage, pgprot_t pgprot)
pmd_t __pmd;

Privacy Policy