diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-23 14:01:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-23 14:01:52 -0700 |
| commit | 7f28f394bd68e58bf3938c67bbeca7825b4687b8 (patch) | |
| tree | b62e7b8e179ccce3244e3f3c75703082f1c2d91c /arch | |
| parent | dbdb90450059e17e8e005ebd3ce0a1fd6008a0c8 (diff) | |
| parent | 73394322a4bf4108847ba3c2eee33a81b1b44450 (diff) | |
| download | op-kernel-dev-7f28f394bd68e58bf3938c67bbeca7825b4687b8.zip op-kernel-dev-7f28f394bd68e58bf3938c67bbeca7825b4687b8.tar.gz | |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/kernel/entry-armv.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index 7152bfb..93b5e8e 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -537,7 +537,7 @@ ENTRY(__switch_to) #ifdef CONFIG_CPU_MPCORE clrex #else - strex r3, r4, [ip] @ Clear exclusive monitor + strex r5, r4, [ip] @ Clear exclusive monitor #endif #endif #if defined(CONFIG_CPU_XSCALE) && !defined(CONFIG_IWMMXT) |
