diff options
| author |   Michael Ellerman <michael@ellerman.id.au> | 2005-08-03 20:21:24 +1000 |
|---|---|---|
| committer |   Paul Mackerras <paulus@samba.org> | 2005-08-29 10:53:36 +1000 |
| commit | aefd16b0c5a594b5feaba23954ad74061f45c8a5 (patch) | |
| tree | 64c52d1e3f1ce58b178561f6d5815887b37a81ba /arch/ppc64/kernel/iSeries_htab.c | |
| parent | [PATCH] ppc64: Consolidate some macros (diff) | |
| download | linux-dev-aefd16b0c5a594b5feaba23954ad74061f45c8a5.tar.xz linux-dev-aefd16b0c5a594b5feaba23954ad74061f45c8a5.zip | |
[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/iSeries_htab.c')
| -rw-r--r-- | arch/ppc64/kernel/iSeries_htab.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/ppc64/kernel/iSeries_htab.c b/arch/ppc64/kernel/iSeries_htab.c index b0250ae4a72a..2192055a90a0 100644 --- a/arch/ppc64/kernel/iSeries_htab.c +++ b/arch/ppc64/kernel/iSeries_htab.c @@ -41,6 +41,7 @@ static long iSeries_hpte_insert(unsigned long hpte_group, unsigned long va, unsigned long prpn, unsigned long vflags, unsigned long rflags) { + unsigned long arpn; long slot; hpte_t lhpte; int secondary = 0; @@ -70,8 +71,10 @@ static long iSeries_hpte_insert(unsigned long hpte_group, unsigned long va, slot &= 0x7fffffffffffffff; } + arpn = phys_to_abs(prpn << PAGE_SHIFT) >> PAGE_SHIFT; + lhpte.v = (va >> 23) << HPTE_V_AVPN_SHIFT | vflags | HPTE_V_VALID; - lhpte.r = (physRpn_to_absRpn(prpn) << HPTE_R_RPN_SHIFT) | rflags; + lhpte.r = (arpn << HPTE_R_RPN_SHIFT) | rflags; /* Now fill in the actual HPTE */ HvCallHpt_addValidate(slot, secondary, &lhpte); |