Commit 43cc1981 authored Feb 22, 2006 by Russell King Committed by Russell King Feb 22, 2006

[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>

parent 75d2f180

arch/arm/kernel/entry-armv.S

+1 −1

Original line number	Diff line number	Diff line
		@@ -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

arch/arm/mm/abort-ev6.S

+1 −1

Original line number	Diff line number	Diff line
		@@ -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