diff options
| author | Olof Johansson <olof@lixom.net> | 2012-05-26 13:30:41 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-05-26 13:30:41 -0700 |
| commit | 67e7ebc21ff5a5bbcb10c9a980896f0e253bcd40 (patch) | |
| tree | f12706b80194f48aad3a1bd70ae9215d48875591 /arch/powerpc/kvm/book3s_hv_rm_mmu.c | |
| parent | 516fb7a22a5347dc6db731369c365ed1f9b64632 (diff) | |
| parent | c533f32e1ac440b8840159f89ece8c9cca2422b5 (diff) | |
Merge branch 'vexpress-v3.4' of git://git.linaro.org/people/pawelmoll/linux into late/soc
A few device tree updates and an include file fix for versatile.
* 'vexpress-v3.4' of git://git.linaro.org/people/pawelmoll/linux:
ARM: vexpress: Remove twice included header files
ARM: vexpress: Device Tree updates
+ update to 3.4
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/powerpc/kvm/book3s_hv_rm_mmu.c')
| -rw-r--r-- | arch/powerpc/kvm/book3s_hv_rm_mmu.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/powerpc/kvm/book3s_hv_rm_mmu.c b/arch/powerpc/kvm/book3s_hv_rm_mmu.c index def880aea63a..cec4daddbf31 100644 --- a/arch/powerpc/kvm/book3s_hv_rm_mmu.c +++ b/arch/powerpc/kvm/book3s_hv_rm_mmu.c @@ -463,6 +463,7 @@ long kvmppc_h_bulk_remove(struct kvm_vcpu *vcpu) /* insert R and C bits from PTE */ rcbits = rev->guest_rpte & (HPTE_R_R|HPTE_R_C); args[j] |= rcbits << (56 - 5); + hp[0] = 0; continue; } |