diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2016-04-29 23:25:27 +1000 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-05-01 18:32:16 +1000 |
| commit | 3910a7f485e1222de2176ef5bf3a1d8de3152920 (patch) | |
| tree | 66de016468eb80717dbe0fc4a3d9b0081031b98c /arch/powerpc/include/asm/kvm_book3s_64.h | |
| parent | 4bece39b503c2340de154c82bf6d928e72d74d4e (diff) | |
| download | blackbird-op-linux-3910a7f485e1222de2176ef5bf3a1d8de3152920.tar.gz blackbird-op-linux-3910a7f485e1222de2176ef5bf3a1d8de3152920.zip | |
powerpc/mm: Add pte_xchg() helper
We have five locations in 64-bit hash MMU code that do a cmpxchg() of a
PTE. Currently doing it inline OK, but in a future patch we will be
converting the PTEs to __be64 in some configs. In that case we will need
casts at every cmpxchg() site in order to keep sparse happy.
So move the logic into a helper, this is a reasonably nice cleanup on
its own.
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Diffstat (limited to 'arch/powerpc/include/asm/kvm_book3s_64.h')
| -rw-r--r-- | arch/powerpc/include/asm/kvm_book3s_64.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/powerpc/include/asm/kvm_book3s_64.h b/arch/powerpc/include/asm/kvm_book3s_64.h index 7529aab068f5..42da513fec2d 100644 --- a/arch/powerpc/include/asm/kvm_book3s_64.h +++ b/arch/powerpc/include/asm/kvm_book3s_64.h @@ -319,11 +319,8 @@ static inline pte_t kvmppc_read_update_linux_pte(pte_t *ptep, int writing) if (writing && pte_write(old_pte)) new_pte = pte_mkdirty(new_pte); - if (pte_val(old_pte) == __cmpxchg_u64((unsigned long *)ptep, - pte_val(old_pte), - pte_val(new_pte))) { + if (pte_xchg(ptep, old_pte, new_pte)) break; - } } return new_pte; } |
