Merge tag 'timers-urgent-2020-12-27' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-microblaze.git] / arch / arm / kernel / iwmmxt.S

diff --git a/arch/arm/kernel/iwmmxt.S b/arch/arm/kernel/iwmmxt.S
index 0dcae78..d2b4ac0 100644 (file)
--- a/arch/arm/kernel/iwmmxt.S
+++ b/arch/arm/kernel/iwmmxt.S
@@ -16,6 +16,7 @@
 #include <asm/thread_info.h>
 #include <asm/asm-offsets.h>
 #include <asm/assembler.h>
+#include "iwmmxt.h"
 
 #if defined(CONFIG_CPU_PJ4) || defined(CONFIG_CPU_PJ4B)
 #define PJ4(code...)           code
@@ -113,33 +114,33 @@ concan_save:
 
 concan_dump:
 
-       wstrw   wCSSF, [r1, #MMX_WCSSF]
-       wstrw   wCASF, [r1, #MMX_WCASF]
-       wstrw   wCGR0, [r1, #MMX_WCGR0]
-       wstrw   wCGR1, [r1, #MMX_WCGR1]
-       wstrw   wCGR2, [r1, #MMX_WCGR2]
-       wstrw   wCGR3, [r1, #MMX_WCGR3]
+       wstrw   wCSSF, r1, MMX_WCSSF
+       wstrw   wCASF, r1, MMX_WCASF
+       wstrw   wCGR0, r1, MMX_WCGR0
+       wstrw   wCGR1, r1, MMX_WCGR1
+       wstrw   wCGR2, r1, MMX_WCGR2
+       wstrw   wCGR3, r1, MMX_WCGR3
 
 1:     @ MUP? wRn
        tst     r2, #0x2
        beq     2f
 
-       wstrd   wR0,  [r1, #MMX_WR0]
-       wstrd   wR1,  [r1, #MMX_WR1]
-       wstrd   wR2,  [r1, #MMX_WR2]
-       wstrd   wR3,  [r1, #MMX_WR3]
-       wstrd   wR4,  [r1, #MMX_WR4]
-       wstrd   wR5,  [r1, #MMX_WR5]
-       wstrd   wR6,  [r1, #MMX_WR6]
-       wstrd   wR7,  [r1, #MMX_WR7]
-       wstrd   wR8,  [r1, #MMX_WR8]
-       wstrd   wR9,  [r1, #MMX_WR9]
-       wstrd   wR10, [r1, #MMX_WR10]
-       wstrd   wR11, [r1, #MMX_WR11]
-       wstrd   wR12, [r1, #MMX_WR12]
-       wstrd   wR13, [r1, #MMX_WR13]
-       wstrd   wR14, [r1, #MMX_WR14]
-       wstrd   wR15, [r1, #MMX_WR15]
+       wstrd   wR0,  r1, MMX_WR0
+       wstrd   wR1,  r1, MMX_WR1
+       wstrd   wR2,  r1, MMX_WR2
+       wstrd   wR3,  r1, MMX_WR3
+       wstrd   wR4,  r1, MMX_WR4
+       wstrd   wR5,  r1, MMX_WR5
+       wstrd   wR6,  r1, MMX_WR6
+       wstrd   wR7,  r1, MMX_WR7
+       wstrd   wR8,  r1, MMX_WR8
+       wstrd   wR9,  r1, MMX_WR9
+       wstrd   wR10, r1, MMX_WR10
+       wstrd   wR11, r1, MMX_WR11
+       wstrd   wR12, r1, MMX_WR12
+       wstrd   wR13, r1, MMX_WR13
+       wstrd   wR14, r1, MMX_WR14
+       wstrd   wR15, r1, MMX_WR15
 
 2:     teq     r0, #0                          @ anything to load?
        reteq   lr                              @ if not, return
@@ -147,30 +148,30 @@ concan_dump:
 concan_load:
 
        @ Load wRn
-       wldrd   wR0,  [r0, #MMX_WR0]
-       wldrd   wR1,  [r0, #MMX_WR1]
-       wldrd   wR2,  [r0, #MMX_WR2]
-       wldrd   wR3,  [r0, #MMX_WR3]
-       wldrd   wR4,  [r0, #MMX_WR4]
-       wldrd   wR5,  [r0, #MMX_WR5]
-       wldrd   wR6,  [r0, #MMX_WR6]
-       wldrd   wR7,  [r0, #MMX_WR7]
-       wldrd   wR8,  [r0, #MMX_WR8]
-       wldrd   wR9,  [r0, #MMX_WR9]
-       wldrd   wR10, [r0, #MMX_WR10]
-       wldrd   wR11, [r0, #MMX_WR11]
-       wldrd   wR12, [r0, #MMX_WR12]
-       wldrd   wR13, [r0, #MMX_WR13]
-       wldrd   wR14, [r0, #MMX_WR14]
-       wldrd   wR15, [r0, #MMX_WR15]
+       wldrd   wR0,  r0, MMX_WR0
+       wldrd   wR1,  r0, MMX_WR1
+       wldrd   wR2,  r0, MMX_WR2
+       wldrd   wR3,  r0, MMX_WR3
+       wldrd   wR4,  r0, MMX_WR4
+       wldrd   wR5,  r0, MMX_WR5
+       wldrd   wR6,  r0, MMX_WR6
+       wldrd   wR7,  r0, MMX_WR7
+       wldrd   wR8,  r0, MMX_WR8
+       wldrd   wR9,  r0, MMX_WR9
+       wldrd   wR10, r0, MMX_WR10
+       wldrd   wR11, r0, MMX_WR11
+       wldrd   wR12, r0, MMX_WR12
+       wldrd   wR13, r0, MMX_WR13
+       wldrd   wR14, r0, MMX_WR14
+       wldrd   wR15, r0, MMX_WR15
 
        @ Load wCx
-       wldrw   wCSSF, [r0, #MMX_WCSSF]
-       wldrw   wCASF, [r0, #MMX_WCASF]
-       wldrw   wCGR0, [r0, #MMX_WCGR0]
-       wldrw   wCGR1, [r0, #MMX_WCGR1]
-       wldrw   wCGR2, [r0, #MMX_WCGR2]
-       wldrw   wCGR3, [r0, #MMX_WCGR3]
+       wldrw   wCSSF, r0, MMX_WCSSF
+       wldrw   wCASF, r0, MMX_WCASF
+       wldrw   wCGR0, r0, MMX_WCGR0
+       wldrw   wCGR1, r0, MMX_WCGR1
+       wldrw   wCGR2, r0, MMX_WCGR2
+       wldrw   wCGR3, r0, MMX_WCGR3
 
        @ clear CUP/MUP (only if r1 != 0)
        teq     r1, #0