[ARM] CONFIG_CPU_MPCORE -> CONFIG_CPU_32v6K
authorRussell King <rmk@dyn-67.arm.linux.org.uk>
Wed, 22 Feb 2006 21:13:28 +0000 (21:13 +0000)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Wed, 22 Feb 2006 21:13:28 +0000 (21:13 +0000)
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>
arch/arm/kernel/entry-armv.S
arch/arm/mm/abort-ev6.S

index 964cd717506bc0bec97f3526206e20cc78a82546..ec48d70c6d8b92d83db16b0f3ce9360944021c54 100644 (file)
@@ -566,7 +566,7 @@ ENTRY(__switch_to)
        ldr     r6, [r2, #TI_CPU_DOMAIN]!
 #endif
 #if __LINUX_ARM_ARCH__ >= 6
        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
        clrex
 #else
        strex   r5, r4, [ip]                    @ Clear exclusive monitor
index dbd346033122140df010997b1c85cb4615b133c1..8a7f65ba14b761cb81ceaa87689f1f0d9a91ed3f 100644 (file)
@@ -20,7 +20,7 @@
  */
        .align  5
 ENTRY(v6_early_abort)
  */
        .align  5
 ENTRY(v6_early_abort)
-#ifdef CONFIG_CPU_MPCORE
+#ifdef CONFIG_CPU_32v6K
        clrex
 #else
        strex   r0, r1, [sp]                    @ Clear the exclusive monitor
        clrex
 #else
        strex   r0, r1, [sp]                    @ Clear the exclusive monitor