update assembler files to versions from MS2 kernel

[ms2-kexec] / tlb-v7.S

diff --git a/tlb-v7.S b/tlb-v7.S
index 12e3bfee98fd6c1c83e128c9f989141ccfb333e4..a26a605b73bd91688417dddc00378f286bfc6a33 100644 (file)
--- a/tlb-v7.S
+++ b/tlb-v7.S
@@ -3,7 +3,6 @@
  *
  *  Copyright (C) 1997-2002 Russell King
  *  Modified for ARMv7 by Catalin Marinas
  *
  *  Copyright (C) 1997-2002 Russell King
  *  Modified for ARMv7 by Catalin Marinas

- *  This Edition is maintained by Matthew Veety (aliasxerog) <mveety@gmail.com>

  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License version 2 as


@@ -12,6 +11,7 @@
  *  ARM architecture version 6 TLB handling functions.
  *  These assume a split I/D TLB.
  */
  *  ARM architecture version 6 TLB handling functions.
  *  These assume a split I/D TLB.
  */

+#include <linux/init.h>

 #include <linux/linkage.h>
 #include <asm/asm-offsets.h>
 #include <asm/page.h>
 #include <linux/linkage.h>
 #include <asm/asm-offsets.h>
 #include <asm/page.h>


@@ -42,9 +42,11 @@ ENTRY(v7wbi_flush_user_tlb_range)
        mov     r1, r1, lsl #PAGE_SHIFT
        vma_vm_flags r2, r2                     @ get vma->vm_flags
 1:
        mov     r1, r1, lsl #PAGE_SHIFT
        vma_vm_flags r2, r2                     @ get vma->vm_flags
 1:

-       mcr     p15, 0, r0, c8, c6, 1           @ TLB invalidate D MVA (was 1)
-       tst     r2, #VM_EXEC                    @ Executable area ?
-       mcrne   p15, 0, r0, c8, c5, 1           @ TLB invalidate I MVA (was 1)
+#ifdef CONFIG_SMP
+       mcr     p15, 0, r0, c8, c3, 1           @ TLB invalidate U MVA (shareable) 
+#else
+       mcr     p15, 0, r0, c8, c7, 1           @ TLB invalidate U MVA
+#endif

        add     r0, r0, #PAGE_SZ
        cmp     r0, r1
        blo     1b
        add     r0, r0, #PAGE_SZ
        cmp     r0, r1
        blo     1b


@@ -69,8 +71,11 @@ ENTRY(v7wbi_flush_kern_tlb_range)
        mov     r0, r0, lsl #PAGE_SHIFT
        mov     r1, r1, lsl #PAGE_SHIFT
 1:
        mov     r0, r0, lsl #PAGE_SHIFT
        mov     r1, r1, lsl #PAGE_SHIFT
 1:

-       mcr     p15, 0, r0, c8, c6, 1           @ TLB invalidate D MVA
-       mcr     p15, 0, r0, c8, c5, 1           @ TLB invalidate I MVA
+#ifdef CONFIG_SMP
+       mcr     p15, 0, r0, c8, c3, 1           @ TLB invalidate U MVA (shareable)
+#else
+       mcr     p15, 0, r0, c8, c7, 1           @ TLB invalidate U MVA
+#endif

        add     r0, r0, #PAGE_SZ
        cmp     r0, r1
        blo     1b
        add     r0, r0, #PAGE_SZ
        cmp     r0, r1
        blo     1b


@@ -81,11 +86,11 @@ ENTRY(v7wbi_flush_kern_tlb_range)
        mov     pc, lr
 ENDPROC(v7wbi_flush_kern_tlb_range)
 
        mov     pc, lr
 ENDPROC(v7wbi_flush_kern_tlb_range)
 

-       .section ".text.init", #alloc, #execinstr
+       __INIT

 
        .type   v7wbi_tlb_fns, #object
 ENTRY(v7wbi_tlb_fns)
        .long   v7wbi_flush_user_tlb_range
        .long   v7wbi_flush_kern_tlb_range
 
        .type   v7wbi_tlb_fns, #object
 ENTRY(v7wbi_tlb_fns)
        .long   v7wbi_flush_user_tlb_range
        .long   v7wbi_flush_kern_tlb_range

-       .long   v6wbi_tlb_flags
+       .long   v7wbi_tlb_flags

        .size   v7wbi_tlb_fns, . - v7wbi_tlb_fns
        .size   v7wbi_tlb_fns, . - v7wbi_tlb_fns