aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--arch/s390/include/asm/pgtable.h15
1 files changed, 7 insertions, 8 deletions
diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h
index 9602154401d2..1ab75eaacbd4 100644
--- a/arch/s390/include/asm/pgtable.h
+++ b/arch/s390/include/asm/pgtable.h
@@ -844,7 +844,6 @@ int gmap_ipte_notify(struct gmap *, unsigned long start, unsigned long len);
844void gmap_do_ipte_notify(struct mm_struct *, pte_t *); 844void gmap_do_ipte_notify(struct mm_struct *, pte_t *);
845 845
846static inline pgste_t pgste_ipte_notify(struct mm_struct *mm, 846static inline pgste_t pgste_ipte_notify(struct mm_struct *mm,
847 unsigned long addr,
848 pte_t *ptep, pgste_t pgste) 847 pte_t *ptep, pgste_t pgste)
849{ 848{
850#ifdef CONFIG_PGSTE 849#ifdef CONFIG_PGSTE
@@ -1104,7 +1103,7 @@ static inline int ptep_test_and_clear_young(struct vm_area_struct *vma,
1104 1103
1105 if (mm_has_pgste(vma->vm_mm)) { 1104 if (mm_has_pgste(vma->vm_mm)) {
1106 pgste = pgste_get_lock(ptep); 1105 pgste = pgste_get_lock(ptep);
1107 pgste = pgste_ipte_notify(vma->vm_mm, addr, ptep, pgste); 1106 pgste = pgste_ipte_notify(vma->vm_mm, ptep, pgste);
1108 } 1107 }
1109 1108
1110 pte = *ptep; 1109 pte = *ptep;
@@ -1150,7 +1149,7 @@ static inline pte_t ptep_get_and_clear(struct mm_struct *mm,
1150 1149
1151 if (mm_has_pgste(mm)) { 1150 if (mm_has_pgste(mm)) {
1152 pgste = pgste_get_lock(ptep); 1151 pgste = pgste_get_lock(ptep);
1153 pgste = pgste_ipte_notify(mm, address, ptep, pgste); 1152 pgste = pgste_ipte_notify(mm, ptep, pgste);
1154 } 1153 }
1155 1154
1156 pte = *ptep; 1155 pte = *ptep;
@@ -1174,7 +1173,7 @@ static inline pte_t ptep_modify_prot_start(struct mm_struct *mm,
1174 1173
1175 if (mm_has_pgste(mm)) { 1174 if (mm_has_pgste(mm)) {
1176 pgste = pgste_get_lock(ptep); 1175 pgste = pgste_get_lock(ptep);
1177 pgste_ipte_notify(mm, address, ptep, pgste); 1176 pgste_ipte_notify(mm, ptep, pgste);
1178 } 1177 }
1179 1178
1180 pte = *ptep; 1179 pte = *ptep;
@@ -1211,7 +1210,7 @@ static inline pte_t ptep_clear_flush(struct vm_area_struct *vma,
1211 1210
1212 if (mm_has_pgste(vma->vm_mm)) { 1211 if (mm_has_pgste(vma->vm_mm)) {
1213 pgste = pgste_get_lock(ptep); 1212 pgste = pgste_get_lock(ptep);
1214 pgste = pgste_ipte_notify(vma->vm_mm, address, ptep, pgste); 1213 pgste = pgste_ipte_notify(vma->vm_mm, ptep, pgste);
1215 } 1214 }
1216 1215
1217 pte = *ptep; 1216 pte = *ptep;
@@ -1245,7 +1244,7 @@ static inline pte_t ptep_get_and_clear_full(struct mm_struct *mm,
1245 1244
1246 if (!full && mm_has_pgste(mm)) { 1245 if (!full && mm_has_pgste(mm)) {
1247 pgste = pgste_get_lock(ptep); 1246 pgste = pgste_get_lock(ptep);
1248 pgste = pgste_ipte_notify(mm, address, ptep, pgste); 1247 pgste = pgste_ipte_notify(mm, ptep, pgste);
1249 } 1248 }
1250 1249
1251 pte = *ptep; 1250 pte = *ptep;
@@ -1270,7 +1269,7 @@ static inline pte_t ptep_set_wrprotect(struct mm_struct *mm,
1270 if (pte_write(pte)) { 1269 if (pte_write(pte)) {
1271 if (mm_has_pgste(mm)) { 1270 if (mm_has_pgste(mm)) {
1272 pgste = pgste_get_lock(ptep); 1271 pgste = pgste_get_lock(ptep);
1273 pgste = pgste_ipte_notify(mm, address, ptep, pgste); 1272 pgste = pgste_ipte_notify(mm, ptep, pgste);
1274 } 1273 }
1275 1274
1276 ptep_flush_lazy(mm, address, ptep); 1275 ptep_flush_lazy(mm, address, ptep);
@@ -1296,7 +1295,7 @@ static inline int ptep_set_access_flags(struct vm_area_struct *vma,
1296 return 0; 1295 return 0;
1297 if (mm_has_pgste(vma->vm_mm)) { 1296 if (mm_has_pgste(vma->vm_mm)) {
1298 pgste = pgste_get_lock(ptep); 1297 pgste = pgste_get_lock(ptep);
1299 pgste = pgste_ipte_notify(vma->vm_mm, address, ptep, pgste); 1298 pgste = pgste_ipte_notify(vma->vm_mm, ptep, pgste);
1300 } 1299 }
1301 1300
1302 ptep_flush_direct(vma->vm_mm, address, ptep); 1301 ptep_flush_direct(vma->vm_mm, address, ptep);