diff options
| author | Russell King | 2006-02-22 22:13:28 +0100 |
|---|---|---|
| committer | Russell King | 2006-02-22 22:13:28 +0100 |
| commit | 43cc19816b3fc5286258e6f5e43ef4ead458f9a3 (patch) | |
| tree | 8ea24fe2df9218d7fab8a3607ac5e644d2456e10 /arch/arm/kernel/entry-armv.S | |
| parent | [ARM] 3345/1: Fix interday RTC alarms (diff) | |
| download | kernel-qcow2-linux-43cc19816b3fc5286258e6f5e43ef4ead458f9a3.tar.gz kernel-qcow2-linux-43cc19816b3fc5286258e6f5e43ef4ead458f9a3.tar.xz kernel-qcow2-linux-43cc19816b3fc5286258e6f5e43ef4ead458f9a3.zip | |
[ARM] CONFIG_CPU_MPCORE -> CONFIG_CPU_32v6K
CONFIG_CPU_MPCORE has never been a configuration symbol - it should
be CONFIG_CPU_32v6K.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/entry-armv.S')
| -rw-r--r-- | arch/arm/kernel/entry-armv.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index 964cd717506b..ec48d70c6d8b 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -566,7 +566,7 @@ ENTRY(__switch_to) ldr r6, [r2, #TI_CPU_DOMAIN]! #endif #if __LINUX_ARM_ARCH__ >= 6 -#ifdef CONFIG_CPU_MPCORE +#ifdef CONFIG_CPU_32v6K clrex #else strex r5, r4, [ip] @ Clear exclusive monitor |