Skip to content

Commit

Permalink
[ARM] CONFIG_CPU_MPCORE -> CONFIG_CPU_32v6K
Browse files Browse the repository at this point in the history 
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>
  • Loading branch information
Russell King authored and Russell King committed Feb 22, 2006
1 parent 75d2f18 commit 43cc198
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion arch/arm/kernel/entry-armv.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/mm/abort-ev6.S
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 43cc198

Please sign in to comment.