diff options
| author | Ben Hutchings <ben@decadent.org.uk> | 2013-06-09 21:09:24 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2013-06-13 10:49:52 -0700 |
| commit | e3a5271b41ebe36c06943c948b1eb8d0c6da30d5 (patch) | |
| tree | 1acb962d01ba7bd18d42541399cdff89ecfc6193 | |
| parent | 054b50539d3dac99c5454e612e541c1f351a38b1 (diff) | |
s390: Add pgste to ptep_modify_prot_start()
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.
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | arch/s390/include/asm/pgtable.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h index fd800157646..39a1c7103fc 100644 --- a/arch/s390/include/asm/pgtable.h +++ b/arch/s390/include/asm/pgtable.h @@ -1063,11 +1063,12 @@ static inline pte_t ptep_modify_prot_start(struct mm_struct *mm, unsigned long address, pte_t *ptep) { + 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)) |