Commit 43cc1981 authored by Russell King's avatar Russell King Committed by Russell King

[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: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 75d2f180
...@@ -566,7 +566,7 @@ ENTRY(__switch_to) ...@@ -566,7 +566,7 @@ ENTRY(__switch_to)
ldr r6, [r2, #TI_CPU_DOMAIN]! ldr r6, [r2, #TI_CPU_DOMAIN]!
#endif #endif
#if __LINUX_ARM_ARCH__ >= 6 #if __LINUX_ARM_ARCH__ >= 6
#ifdef CONFIG_CPU_MPCORE #ifdef CONFIG_CPU_32v6K
clrex clrex
#else #else
strex r5, r4, [ip] @ Clear exclusive monitor strex r5, r4, [ip] @ Clear exclusive monitor
......
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
*/ */
.align 5 .align 5
ENTRY(v6_early_abort) ENTRY(v6_early_abort)
#ifdef CONFIG_CPU_MPCORE #ifdef CONFIG_CPU_32v6K
clrex clrex
#else #else
strex r0, r1, [sp] @ Clear the exclusive monitor strex r0, r1, [sp] @ Clear the exclusive monitor
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment