2 files changed, 2 insertions, 2 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
diff --git a/arch/arm/mm/abort-ev6.S b/arch/arm/mm/abort-ev6.S
index dbd346033122..8a7f65ba14b7 100644
--- a/arch/arm/mm/abort-ev6.S
+++ b/arch/arm/mm/abort-ev6.S
@@ -20,7 +20,7 @@
 */
        .align  5
 ENTRY(v6_early_abort)
-#ifdef CONFIG_CPU_MPCORE
+#ifdef CONFIG_CPU_32v6K
        clrex
 #else
        strex   r0, r1, [sp]                    @ Clear the exclusive monitor

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)
566	ldr r6, [r2, #TI_CPU_DOMAIN]!	566	ldr r6, [r2, #TI_CPU_DOMAIN]!
567	#endif	567	#endif
568	#if __LINUX_ARM_ARCH__ >= 6	568	#if __LINUX_ARM_ARCH__ >= 6
569	#ifdef CONFIG_CPU_MPCORE	569	#ifdef CONFIG_CPU_32v6K
570	clrex	570	clrex
571	#else	571	#else
572	strex r5, r4, [ip] @ Clear exclusive monitor	572	strex r5, r4, [ip] @ Clear exclusive monitor


diff --git a/arch/arm/mm/abort-ev6.S b/arch/arm/mm/abort-ev6.S index dbd346033122..8a7f65ba14b7 100644 --- a/arch/arm/mm/abort-ev6.S +++ b/arch/arm/mm/abort-ev6.S
@@ -20,7 +20,7 @@
20	*/	20	*/
21	.align 5	21	.align 5
22	ENTRY(v6_early_abort)	22	ENTRY(v6_early_abort)
23	#ifdef CONFIG_CPU_MPCORE	23	#ifdef CONFIG_CPU_32v6K
24	clrex	24	clrex
25	#else	25	#else
26	strex r0, r1, [sp] @ Clear the exclusive monitor	26	strex r0, r1, [sp] @ Clear the exclusive monitor