diff options
| author | Christian Borntraeger <borntraeger@de.ibm.com> | 2013-06-05 09:22:33 +0200 |
|---|---|---|
| committer | Martin Schwidefsky <schwidefsky@de.ibm.com> | 2013-06-05 17:36:20 +0200 |
| commit | 3a82603be4f5523ce21dd468a323aa36ff845f6d (patch) | |
| tree | 3b73b3c0bcdbadc30448f69705eac93be19444fc /arch/s390 | |
| parent | 9cc5c206d9b44b7763aab3082a5be72c78a3ef7a (diff) | |
| download | linux-3.10-3a82603be4f5523ce21dd468a323aa36ff845f6d.tar.gz linux-3.10-3a82603be4f5523ce21dd468a323aa36ff845f6d.tar.bz2 linux-3.10-3a82603be4f5523ce21dd468a323aa36ff845f6d.zip | |
s390/pgtable: Save pgste during modify_prot_start/commit
In modify_prot_start we update the pgste value but never store it back
into the original location. Lets save the calculated result, since
modify_prot_commit will use the value of the pgste.
Signed-off-by: Christian Borntraeger <borntraeger@de.ibm.com>
Signed-off-by: Martin Schwidefsky <schwidefsky@de.ibm.com>
Diffstat (limited to 'arch/s390')
| -rw-r--r-- | arch/s390/include/asm/pgtable.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/arch/s390/include/asm/pgtable.h b/arch/s390/include/asm/pgtable.h index 391e592356d..f9a0a70dc93 100644 --- a/arch/s390/include/asm/pgtable.h +++ b/arch/s390/include/asm/pgtable.h @@ -640,6 +640,13 @@ static inline void pgste_set_unlock(pte_t *ptep, pgste_t pgste) #endif } +static inline void pgste_set(pte_t *ptep, pgste_t pgste) +{ +#ifdef CONFIG_PGSTE + *(pgste_t *)(ptep + PTRS_PER_PTE) = pgste; +#endif +} + static inline pgste_t pgste_update_all(pte_t *ptep, pgste_t pgste) { #ifdef CONFIG_PGSTE @@ -1101,8 +1108,10 @@ static inline pte_t ptep_modify_prot_start(struct mm_struct *mm, if (!mm_exclusive(mm)) __ptep_ipte(address, ptep); - if (mm_has_pgste(mm)) + if (mm_has_pgste(mm)) { pgste = pgste_update_all(&pte, pgste); + pgste_set(ptep, pgste); + } return pte; } |