aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/lib/bitops.h
diff options
context:
space:
mode:
authorStefan Agner <stefan@agner.ch>2019-02-17 18:56:58 -0500
committerRussell King <rmk+kernel@armlinux.org.uk>2019-02-26 06:26:06 -0500
commitc001899a5d6c2d7a0f3b75b2307ddef137fb46a6 (patch)
treed616a4295c0697ebae7be453ca39af5e7ceb36b3 /arch/arm/lib/bitops.h
parenta216376add730ec86a8bcee5735f62fd890cb2d0 (diff)
ARM: 8843/1: use unified assembler in headers
Use unified assembler syntax (UAL) in headers. 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/bitops.h')
-rw-r--r--arch/arm/lib/bitops.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/lib/bitops.h b/arch/arm/lib/bitops.h
index 93cddab73072..95bd35991288 100644
--- a/arch/arm/lib/bitops.h
+++ b/arch/arm/lib/bitops.h
@@ -7,7 +7,7 @@
7ENTRY( \name ) 7ENTRY( \name )
8UNWIND( .fnstart ) 8UNWIND( .fnstart )
9 ands ip, r1, #3 9 ands ip, r1, #3
10 strneb r1, [ip] @ assert word-aligned 10 strbne r1, [ip] @ assert word-aligned
11 mov r2, #1 11 mov r2, #1
12 and r3, r0, #31 @ Get bit offset 12 and r3, r0, #31 @ Get bit offset
13 mov r0, r0, lsr #5 13 mov r0, r0, lsr #5
@@ -32,7 +32,7 @@ ENDPROC(\name )
32ENTRY( \name ) 32ENTRY( \name )
33UNWIND( .fnstart ) 33UNWIND( .fnstart )
34 ands ip, r1, #3 34 ands ip, r1, #3
35 strneb r1, [ip] @ assert word-aligned 35 strbne r1, [ip] @ assert word-aligned
36 mov r2, #1 36 mov r2, #1
37 and r3, r0, #31 @ Get bit offset 37 and r3, r0, #31 @ Get bit offset
38 mov r0, r0, lsr #5 38 mov r0, r0, lsr #5
@@ -62,7 +62,7 @@ ENDPROC(\name )
62ENTRY( \name ) 62ENTRY( \name )
63UNWIND( .fnstart ) 63UNWIND( .fnstart )
64 ands ip, r1, #3 64 ands ip, r1, #3
65 strneb r1, [ip] @ assert word-aligned 65 strbne r1, [ip] @ assert word-aligned
66 and r2, r0, #31 66 and r2, r0, #31
67 mov r0, r0, lsr #5 67 mov r0, r0, lsr #5
68 mov r3, #1 68 mov r3, #1
@@ -89,7 +89,7 @@ ENDPROC(\name )
89ENTRY( \name ) 89ENTRY( \name )
90UNWIND( .fnstart ) 90UNWIND( .fnstart )
91 ands ip, r1, #3 91 ands ip, r1, #3
92 strneb r1, [ip] @ assert word-aligned 92 strbne r1, [ip] @ assert word-aligned
93 and r3, r0, #31 93 and r3, r0, #31
94 mov r0, r0, lsr #5 94 mov r0, r0, lsr #5
95 save_and_disable_irqs ip 95 save_and_disable_irqs ip