diff options
| author | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
|---|---|---|
| committer | Glenn Elliott <gelliott@cs.unc.edu> | 2012-03-04 19:47:13 -0500 |
| commit | c71c03bda1e86c9d5198c5d83f712e695c4f2a1e (patch) | |
| tree | ecb166cb3e2b7e2adb3b5e292245fefd23381ac8 /arch/arm/lib/testclearbit.S | |
| parent | ea53c912f8a86a8567697115b6a0d8152beee5c8 (diff) | |
| parent | 6a00f206debf8a5c8899055726ad127dbeeed098 (diff) | |
Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp
Conflicts:
litmus/sched_cedf.c
Diffstat (limited to 'arch/arm/lib/testclearbit.S')
| -rw-r--r-- | arch/arm/lib/testclearbit.S | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/arch/arm/lib/testclearbit.S b/arch/arm/lib/testclearbit.S index 543d7094d18e..521b66b5b95d 100644 --- a/arch/arm/lib/testclearbit.S +++ b/arch/arm/lib/testclearbit.S | |||
| @@ -12,9 +12,6 @@ | |||
| 12 | #include "bitops.h" | 12 | #include "bitops.h" |
| 13 | .text | 13 | .text |
| 14 | 14 | ||
| 15 | ENTRY(_test_and_clear_bit_be) | 15 | ENTRY(_test_and_clear_bit) |
| 16 | eor r0, r0, #0x18 @ big endian byte ordering | 16 | testop bicne, strne |
| 17 | ENTRY(_test_and_clear_bit_le) | 17 | ENDPROC(_test_and_clear_bit) |
| 18 | testop bicne, strneb | ||
| 19 | ENDPROC(_test_and_clear_bit_be) | ||
| 20 | ENDPROC(_test_and_clear_bit_le) | ||