diff options
| author |   Radim Krčmář <rkrcmar@redhat.com> | 2016-11-29 14:26:55 +0100 |
|---|---|---|
| committer | Radim Krčmář <rkrcmar@redhat.com> | 2016-11-29 14:26:55 +0100 |
| commit | ffcb09f27f46ea21305c7846de1fd3b76e4e6a6f (patch) | |
| tree | 7c0e2b94dfd54811714ad06705bf80df39a1f4e5 /arch/powerpc/platforms/ps3/htab.c | |
| parent | Merge tag 'kvm-s390-next-4.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux (diff) | |
| parent | KVM: Add halt polling documentation (diff) | |
| download | wireguard-linux-ffcb09f27f46ea21305c7846de1fd3b76e4e6a6f.tar.xz wireguard-linux-ffcb09f27f46ea21305c7846de1fd3b76e4e6a6f.zip | |
Merge branch 'kvm-ppc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc
PPC KVM update for 4.10:
* Support for KVM guests on POWER9 using the hashed page table MMU.
* Updates and improvements to the halt-polling support on PPC, from
Suraj Jitindar Singh.
* An optimization to speed up emulated MMIO, from Yongji Xie.
* Various other minor cleanups.
Diffstat (limited to '')
| -rw-r--r-- | arch/powerpc/platforms/ps3/htab.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/ps3/htab.c b/arch/powerpc/platforms/ps3/htab.c index cb3c50328de8..cc2b281a3766 100644 --- a/arch/powerpc/platforms/ps3/htab.c +++ b/arch/powerpc/platforms/ps3/htab.c @@ -63,7 +63,7 @@ static long ps3_hpte_insert(unsigned long hpte_group, unsigned long vpn, vflags &= ~HPTE_V_SECONDARY; hpte_v = hpte_encode_v(vpn, psize, apsize, ssize) | vflags | HPTE_V_VALID; - hpte_r = hpte_encode_r(ps3_mm_phys_to_lpar(pa), psize, apsize, ssize) | rflags; + hpte_r = hpte_encode_r(ps3_mm_phys_to_lpar(pa), psize, apsize) | rflags; spin_lock_irqsave(&ps3_htab_lock, flags); |