diff options
| author | Michael Ellerman <mpe@ellerman.id.au> | 2016-11-24 22:14:52 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2016-11-24 22:14:52 +1100 |
| commit | ddbefe7e77603cc9645a571a8bf680e193caac97 (patch) | |
| tree | 9f090379fded3967094a52c871e1a2c615551150 /arch/powerpc/platforms/pseries/lpar.c | |
| parent | 3382a6220ff3bac886d9d90766f3fe18cf25b468 (diff) | |
| parent | 02ed21aeda0e02d84af493f92b1b6b6b13ddd6e8 (diff) | |
| download | op-kernel-dev-ddbefe7e77603cc9645a571a8bf680e193caac97.zip op-kernel-dev-ddbefe7e77603cc9645a571a8bf680e193caac97.tar.gz | |
Merge branch 'topic/ppc-kvm' into next
Merge the topic branch we're sharing with the kvm-ppc tree.
Diffstat (limited to 'arch/powerpc/platforms/pseries/lpar.c')
| -rw-r--r-- | arch/powerpc/platforms/pseries/lpar.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/platforms/pseries/lpar.c b/arch/powerpc/platforms/pseries/lpar.c index 24ad43a..486e570 100644 --- a/arch/powerpc/platforms/pseries/lpar.c +++ b/arch/powerpc/platforms/pseries/lpar.c @@ -145,7 +145,7 @@ static long pSeries_lpar_hpte_insert(unsigned long hpte_group, hpte_group, vpn, pa, rflags, vflags, psize); hpte_v = hpte_encode_v(vpn, psize, apsize, ssize) | vflags | HPTE_V_VALID; - hpte_r = hpte_encode_r(pa, psize, apsize, ssize) | rflags; + hpte_r = hpte_encode_r(pa, psize, apsize) | rflags; if (!(vflags & HPTE_V_BOLTED)) pr_devel(" hpte_v=%016lx, hpte_r=%016lx\n", hpte_v, hpte_r); |
