summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorDaniel Hellstrom <daniel@gaisler.com>2010-10-25 23:23:46 +0200
committerDavid S. Miller <davem@davemloft.net>2010-10-26 18:02:44 +0200
commit502279a7cd1e4b1d320ee2c9a25eca165232d213 (patch)
tree7e3f13cdb422847b8737b1cab7d1fb47a29a8e43 /arch
parentsparc32: remove CONFIG_HAVE_PERF_EVENTS option (diff)
downloadlinux-502279a7cd1e4b1d320ee2c9a25eca165232d213.tar.xz
linux-502279a7cd1e4b1d320ee2c9a25eca165232d213.zip
sparc: Fixed random SPARC/LEON SMP CPU Stuck problem.
Signed-off-by: Daniel Hellstrom <daniel@gaisler.com> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch')
-rw-r--r--arch/sparc/kernel/leon_smp.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/kernel/leon_smp.c b/arch/sparc/kernel/leon_smp.c
index e1656fc41ccb..7524689b03d2 100644
--- a/arch/sparc/kernel/leon_smp.c
+++ b/arch/sparc/kernel/leon_smp.c
@@ -56,8 +56,8 @@ void __init leon_configure_cache_smp(void);
static inline unsigned long do_swap(volatile unsigned long *ptr,
unsigned long val)
{
- __asm__ __volatile__("swapa [%1] %2, %0\n\t" : "=&r"(val)
- : "r"(ptr), "i"(ASI_LEON_DCACHE_MISS)
+ __asm__ __volatile__("swapa [%2] %3, %0\n\t" : "=&r"(val)
+ : "0"(val), "r"(ptr), "i"(ASI_LEON_DCACHE_MISS)
: "memory");
return val;
}