Skip to content

L
linux-davinci
Commit 7f28f394 authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

Merge master.kernel.org:/home/rmk/linux-2.6-arm

parents dbdb9045 73394322
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
arch/arm/kernel/entry-armv.S
View file @ 7f28f394
...@@ -537,7 +537,7 @@ ENTRY(__switch_to) ...@@ -537,7 +537,7 @@ ENTRY(__switch_to)
#ifdef CONFIG_CPU_MPCORE #ifdef CONFIG_CPU_MPCORE
clrex clrex
#else #else
strex r3, r4, [ip] @ Clear exclusive monitor strex r5, r4, [ip] @ Clear exclusive monitor
#endif #endif
#endif #endif
#if defined(CONFIG_CPU_XSCALE) && !defined(CONFIG_IWMMXT) #if defined(CONFIG_CPU_XSCALE) && !defined(CONFIG_IWMMXT)
......
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