summaryrefslogtreecommitdiff
path: root/arch/arm/lib/copy_page.S
diff options
context:
space:
mode:
authorStefan Agner <stefan@agner.ch>2019-02-18 00:57:38 +0100
committerRussell King <rmk+kernel@armlinux.org.uk>2019-02-26 11:26:07 +0000
commite44fc38818ed795f4c661d5414c6e0affae0fa63 (patch)
tree18ae6b713c3b34e8963ff76df1c33fe0cfbe5de1 /arch/arm/lib/copy_page.S
parentc001899a5d6c2d7a0f3b75b2307ddef137fb46a6 (diff)
ARM: 8844/1: use unified assembler in assembly files
Use unified assembler syntax (UAL) in assembly files. Divided syntax is considered deprecated. This will also allow to build the kernel using LLVM's integrated assembler. Signed-off-by: Stefan Agner <stefan@agner.ch> Acked-by: Nicolas Pitre <nico@linaro.org> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Diffstat (limited to 'arch/arm/lib/copy_page.S')
-rw-r--r--arch/arm/lib/copy_page.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/lib/copy_page.S b/arch/arm/lib/copy_page.S
index 6ee2f6706f86..b84ce1792043 100644
--- a/arch/arm/lib/copy_page.S
+++ b/arch/arm/lib/copy_page.S
@@ -39,9 +39,9 @@ ENTRY(copy_page)
.endr
subs r2, r2, #1 @ 1
stmia r0!, {r3, r4, ip, lr} @ 4
- ldmgtia r1!, {r3, r4, ip, lr} @ 4
+ ldmiagt r1!, {r3, r4, ip, lr} @ 4
bgt 1b @ 1
- PLD( ldmeqia r1!, {r3, r4, ip, lr} )
+ PLD( ldmiaeq r1!, {r3, r4, ip, lr} )
PLD( beq 2b )
ldmfd sp!, {r4, pc} @ 3
ENDPROC(copy_page)