[SPARC64]: Handle hypervisor case correctly in copy_tsb().

Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/arch/sparc64/mm/tsb.c b/arch/sparc64/mm/tsb.c
index 6ae2a5a702cb897e2aec50c29c0728f20ea1c2a6..c5dc4b0cc1c5cc926f1e0816f466e829386b8530 100644 (file)
--- a/arch/sparc64/mm/tsb.c
+++ b/arch/sparc64/mm/tsb.c
@@ -231,7 +231,13 @@ static void copy_tsb(struct tsb *old_tsb, unsigned long old_size,
                register unsigned long pte asm("o5");
                unsigned long v, hash;
 
-               if (tlb_type == cheetah_plus) {
+               if (tlb_type == hypervisor) {
+                       __asm__ __volatile__(
+                               "ldda [%2] %3, %0"
+                               : "=r" (tag), "=r" (pte)
+                               : "r" (__pa(&old_tsb[i])),
+                                 "i" (ASI_QUAD_LDD_PHYS_4V));
+               } else if (tlb_type == cheetah_plus) {
                        __asm__ __volatile__(
                                "ldda [%2] %3, %0"
                                : "=r" (tag), "=r" (pte)
@@ -267,7 +273,8 @@ static void copy_tsb(struct tsb *old_tsb, unsigned long old_size,
                v |= (i & (512UL - 1UL)) << 13UL;
 
                hash = tsb_hash(v, new_nentries);
-               if (tlb_type == cheetah_plus) {
+               if (tlb_type == cheetah_plus ||
+                   tlb_type == hypervisor) {
                        __asm__ __volatile__(
                                "stxa   %0, [%1] %2\n\t"
                                "stxa   %3, [%4] %2"