diff options
| author | Russell King <rmk@dyn-67.arm.linux.org.uk> | 2005-11-03 16:02:39 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-11-03 16:02:39 -0500 |
| commit | 5f8b1178e246422ebddc1b16487314c91edf85fe (patch) | |
| tree | 67b0b09acc80bfc1ca81f92cdad45ca156706bea /arch/arm/lib/bitops.h | |
| parent | 24bcc2f46cf8982dbc02c8e3037dfc5e12f1e35c (diff) | |
| parent | 7e5e6e9a509c4ed2973a345ec7ffb96577f42e26 (diff) | |
[ARM] Merge SMP tree
Diffstat (limited to 'arch/arm/lib/bitops.h')
| -rw-r--r-- | arch/arm/lib/bitops.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/lib/bitops.h b/arch/arm/lib/bitops.h index 64a988c1ad44..f35d91fbe117 100644 --- a/arch/arm/lib/bitops.h +++ b/arch/arm/lib/bitops.h | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | #include <linux/config.h> | 1 | #include <linux/config.h> |
| 2 | 2 | ||
| 3 | #if __LINUX_ARM_ARCH__ >= 6 && defined(CONFIG_CPU_MPCORE) | 3 | #if __LINUX_ARM_ARCH__ >= 6 && defined(CONFIG_CPU_32v6K) |
| 4 | .macro bitop, instr | 4 | .macro bitop, instr |
| 5 | mov r2, #1 | 5 | mov r2, #1 |
| 6 | and r3, r0, #7 @ Get bit offset | 6 | and r3, r0, #7 @ Get bit offset |