aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ppc64/kernel/pSeries_lpar.c
diff options
context:
space:
mode:
authorMichael Ellerman <michael@ellerman.id.au>2005-08-03 06:21:24 -0400
committerPaul Mackerras <paulus@samba.org>2005-08-28 20:53:36 -0400
commitaefd16b0c5a594b5feaba23954ad74061f45c8a5 (patch)
tree64c52d1e3f1ce58b178561f6d5815887b37a81ba /arch/ppc64/kernel/pSeries_lpar.c
parentce21795275ab469b97384faa36462350af17eca0 (diff)
[PATCH] ppc64: Remove redundant uses of physRpn_to_absRpn
physRpn_to_absRpn is a no-op on non-iSeries platforms, remove the two redundant calls. There's only one caller on iSeries so fold the logic in there so we can get rid of it completely. Signed-off-by: Michael Ellerman <michael@ellerman.id.au> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch/ppc64/kernel/pSeries_lpar.c')
-rw-r--r--arch/ppc64/kernel/pSeries_lpar.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/ppc64/kernel/pSeries_lpar.c b/arch/ppc64/kernel/pSeries_lpar.c
index 56845543c891..0a3ddc9227c5 100644
--- a/arch/ppc64/kernel/pSeries_lpar.c
+++ b/arch/ppc64/kernel/pSeries_lpar.c
@@ -278,7 +278,6 @@ long pSeries_lpar_hpte_insert(unsigned long hpte_group,
278 unsigned long va, unsigned long prpn, 278 unsigned long va, unsigned long prpn,
279 unsigned long vflags, unsigned long rflags) 279 unsigned long vflags, unsigned long rflags)
280{ 280{
281 unsigned long arpn = physRpn_to_absRpn(prpn);
282 unsigned long lpar_rc; 281 unsigned long lpar_rc;
283 unsigned long flags; 282 unsigned long flags;
284 unsigned long slot; 283 unsigned long slot;
@@ -289,7 +288,7 @@ long pSeries_lpar_hpte_insert(unsigned long hpte_group,
289 if (vflags & HPTE_V_LARGE) 288 if (vflags & HPTE_V_LARGE)
290 hpte_v &= ~(1UL << HPTE_V_AVPN_SHIFT); 289 hpte_v &= ~(1UL << HPTE_V_AVPN_SHIFT);
291 290
292 hpte_r = (arpn << HPTE_R_RPN_SHIFT) | rflags; 291 hpte_r = (prpn << HPTE_R_RPN_SHIFT) | rflags;
293 292
294 /* Now fill in the actual HPTE */ 293 /* Now fill in the actual HPTE */
295 /* Set CEC cookie to 0 */ 294 /* Set CEC cookie to 0 */