sparc32: vm_area_struct access for old Sun SPARCs.

upstream commit 961246b4ed8da3bcf4ee1eb9147f341013553e3c.

Commit e4c6bfd2d79d063017ab19a18915f0bc759f32d9 ("mm: rearrange
vm_area_struct for fewer cache misses") changed the layout of the
vm_area_struct structure, it broke several SPARC32 assembly routines
which used numerical constants for accessing the vm_mm field.

This patch defines the VMA_VM_MM constant to replace the immediate values.

Signed-off-by: Olivier DANET <odanet@caramail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 4 insertions, 4 deletions

diff --git a/arch/sparc/mm/swift.S b/arch/sparc/mm/swift.S
index c801c3953a00..5d2b88d39424 100644
--- a/arch/sparc/mm/swift.S
+++ b/arch/sparc/mm/swift.S
@@ -105,7 +105,7 @@ swift_flush_cache_mm_out:
 
         .globl  swift_flush_cache_range
 swift_flush_cache_range:
-        ld      [%o0 + 0x0], %o0                /* XXX vma->vm_mm, GROSS XXX */
+        ld      [%o0 + VMA_VM_MM], %o0
         sub     %o2, %o1, %o2
         sethi   %hi(4096), %o3
         cmp     %o2, %o3
@@ -116,7 +116,7 @@ swift_flush_cache_range:
 
         .globl  swift_flush_cache_page
 swift_flush_cache_page:
-        ld      [%o0 + 0x0], %o0                /* XXX vma->vm_mm, GROSS XXX */
+        ld      [%o0 + VMA_VM_MM], %o0
 70:
         ld      [%o0 + AOFF_mm_context], %g2
         cmp     %g2, -1
@@ -219,7 +219,7 @@ swift_flush_sig_insns:
         .globl  swift_flush_tlb_range
         .globl  swift_flush_tlb_all
 swift_flush_tlb_range:
-        ld      [%o0 + 0x00], %o0       /* XXX vma->vm_mm GROSS XXX */
+        ld      [%o0 + VMA_VM_MM], %o0
 swift_flush_tlb_mm:
         ld      [%o0 + AOFF_mm_context], %g2
         cmp     %g2, -1
@@ -233,7 +233,7 @@ swift_flush_tlb_all_out:
 
         .globl  swift_flush_tlb_page
 swift_flush_tlb_page:
-        ld      [%o0 + 0x00], %o0       /* XXX vma->vm_mm GROSS XXX */
+        ld      [%o0 + VMA_VM_MM], %o0
         mov     SRMMU_CTX_REG, %g1
         ld      [%o0 + AOFF_mm_context], %o3
         andn    %o1, (PAGE_SIZE - 1), %o1