Skip to contentSkip to conversation

s390: Add pgste to ptep_modify_prot_start()

PATCH Heiko Carstens 1 participant 1 message Jun 10, 2013 1 message not in the archive s390

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

#1 lore raw
Quoted 17 lines · Ben Hutchings

Commit 52f36be0f4e2 's390/pgtable: Fix check for pgste/storage key handling', which was commit b56433cb782d upstream, added a use of pgste to ptep_modify_prot_start(), but this variable does not exist. In mainline, pgste was added by commit d3383632d4e8 's390/mm: add pte invalidation notifier for kvm' and initialised to the return value of pgste_get_lock(ptep). Initialise it similarly here.

Compile-tested only.

---

arch/s390/include/asm/pgtable.h +0 -0
@@ -1063,11 +1063,12 @@ static inline pte_t ptep_modify_prot_sta
 					   unsigned long address,
 					   pte_t *ptep)
 {

arch/s390/include/asm/pgtable.h static inline pte_t ptep_modify_prot_sta · line 1074

Quoted 10 lines
arch/s390/include/asm/pgtable.h +2 -1
+	pgste_t pgste;
 	pte_t pte;
 
 	mm->context.flush_mm = 1;
 	if (mm_has_pgste(mm))
-		pgste_get_lock(ptep);
+		pgste = pgste_get_lock(ptep);
 
 	pte = *ptep;
 	if (!mm_exclusive(mm))

Looks good. Thanks!