aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-07-01 09:36:15 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-07-01 09:36:15 -0700
commit1e31b0ffbb3b10133044e9c4bec4bd4b3f278229 (patch)
treea7b30dd35e1321b93e44ae107e7fe4c43ad8c20b
parent980019d74e4b2428362b36a0506519d6d9460800 (diff)
parentb70f4e85bfc4d7000036355b714a92d5c574f1be (diff)
downloadlinux-2.6.34-ux500-1e31b0ffbb3b10133044e9c4bec4bd4b3f278229.tar.gz
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] Fix spinaphore down_spin()
-rw-r--r--arch/ia64/mm/tlb.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/mm/tlb.c b/arch/ia64/mm/tlb.c
index 5dfd916e9ea..7b3cdc6c6d9 100644
--- a/arch/ia64/mm/tlb.c
+++ b/arch/ia64/mm/tlb.c
@@ -121,7 +121,7 @@ static inline void down_spin(struct spinaphore *ss)
ia64_invala();
for (;;) {
- asm volatile ("ld4.c.nc %0=[%1]" : "=r"(serve) : "r"(&ss->serve) : "memory");
+ asm volatile ("ld8.c.nc %0=[%1]" : "=r"(serve) : "r"(&ss->serve) : "memory");
if (time_before(t, serve))
return;
cpu_relax();