[PATCH] ppc64: Store virtual address in TLB flush batches

This patch slightly change the TLB flush batch mecanism so that we
store the full vaddr (including vsid) when adding an entry to the
batch so that the flush part doesn't have to get to the context.

This cleans it a bit, and paves the way to future updates like
dynamic vsids.

Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Signed-off-by: Paul Mackerras <paulus@samba.org>

1 files changed, 3 insertions, 10 deletions

diff --git a/arch/ppc64/mm/hash_native.c b/arch/ppc64/mm/hash_native.c
index 7626bb59954d..29b074505d3e 100644
--- a/arch/ppc64/mm/hash_native.c
+++ b/arch/ppc64/mm/hash_native.c
@@ -335,10 +335,9 @@ static void native_hpte_clear(void)
         local_irq_restore(flags);
 }
 
-static void native_flush_hash_range(unsigned long context,
-                                    unsigned long number, int local)
+static void native_flush_hash_range(unsigned long number, int local)
 {
-        unsigned long vsid, vpn, va, hash, secondary, slot, flags, avpn;
+        unsigned long va, vpn, hash, secondary, slot, flags, avpn;
         int i, j;
         hpte_t *hptep;
         unsigned long hpte_v;
@@ -351,13 +350,7 @@ static void native_flush_hash_range(unsigned long context,
 
         j = 0;
         for (i = 0; i < number; i++) {
-                if (batch->addr[i] < KERNELBASE)
-                        vsid = get_vsid(context, batch->addr[i]);
-                else
-                        vsid = get_kernel_vsid(batch->addr[i]);
-
-                va = (vsid << 28) | (batch->addr[i] & 0x0fffffff);
-                batch->vaddr[j] = va;
+                va = batch->vaddr[j];
                 if (large)
                         vpn = va >> HPAGE_SHIFT;
                 else