diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-16 19:35:26 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-03-16 19:35:26 -0400 |
| commit | bd1274dc005c2cee41771a7cc616f4709a6e6323 (patch) | |
| tree | fcfe103a499ca9e3d8fa0ecbca5b7d0d274da5ca /arch/arm/lib/testsetbit.S | |
| parent | 1f0090a1eaa1b750a2fc5c99c91b790d5322a1fd (diff) | |
| parent | 3ba6e69ad887f8a814267ed36fd4bfbddf8855a9 (diff) | |
Merge branch 'v6v7' into devel
Conflicts:
arch/arm/include/asm/cacheflush.h
arch/arm/include/asm/proc-fns.h
arch/arm/mm/Kconfig
Diffstat (limited to 'arch/arm/lib/testsetbit.S')
| -rw-r--r-- | arch/arm/lib/testsetbit.S | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/arm/lib/testsetbit.S b/arch/arm/lib/testsetbit.S index 0b3f390401c..1c98cc2185b 100644 --- a/arch/arm/lib/testsetbit.S +++ b/arch/arm/lib/testsetbit.S | |||
| @@ -12,9 +12,6 @@ | |||
| 12 | #include "bitops.h" | 12 | #include "bitops.h" |
| 13 | .text | 13 | .text |
| 14 | 14 | ||
| 15 | ENTRY(_test_and_set_bit_be) | 15 | ENTRY(_test_and_set_bit) |
| 16 | eor r0, r0, #0x18 @ big endian byte ordering | 16 | testop orreq, streq |
| 17 | ENTRY(_test_and_set_bit_le) | 17 | ENDPROC(_test_and_set_bit) |
| 18 | testop orreq, streqb | ||
| 19 | ENDPROC(_test_and_set_bit_be) | ||
| 20 | ENDPROC(_test_and_set_bit_le) | ||