diff options
| author | Gleb Natapov <gleb@redhat.com> | 2013-09-01 10:48:18 +0300 |
|---|---|---|
| committer | Gleb Natapov <gleb@redhat.com> | 2013-09-01 10:48:18 +0300 |
| commit | 6b9e4fa07443f5baf5bbd7ab043abd6976f8d7bc (patch) | |
| tree | 268566f7aa477b488a73bde987265318160d6fcc /arch/arm/include/asm | |
| parent | 9b2d2e0df8a49414b1e5bc89148c9984dd87782a (diff) | |
| parent | 1fe40f6d39d23f39e643607a3e1883bfc74f1244 (diff) | |
Merge tag 'kvm-arm-for-3.12' of git://git.linaro.org/people/cdall/linux-kvm-arm into queue
KVM/ARM Updates for Linux 3.12
* tag 'kvm-arm-for-3.12' of git://git.linaro.org/people/cdall/linux-kvm-arm:
ARM: KVM: Add newlines to panic strings
ARM: KVM: Work around older compiler bug
ARM: KVM: Simplify tracepoint text
ARM: KVM: Fix kvm_set_pte assignment
Diffstat (limited to 'arch/arm/include/asm')
| -rw-r--r-- | arch/arm/include/asm/kvm_mmu.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/include/asm/kvm_mmu.h b/arch/arm/include/asm/kvm_mmu.h index 472ac709100..9b28c41f4ba 100644 --- a/arch/arm/include/asm/kvm_mmu.h +++ b/arch/arm/include/asm/kvm_mmu.h @@ -64,7 +64,7 @@ void kvm_clear_hyp_idmap(void); static inline void kvm_set_pte(pte_t *pte, pte_t new_pte) { - pte_val(*pte) = new_pte; + *pte = new_pte; /* * flush_pmd_entry just takes a void pointer and cleans the necessary * cache entries, so we can reuse the function for ptes. |