diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-01 18:36:15 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-01 18:36:15 +0200 |
| commit | 1e31b0ffbb3b10133044e9c4bec4bd4b3f278229 (patch) | |
| tree | a7b30dd35e1321b93e44ae107e7fe4c43ad8c20b /arch | |
| parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 (diff) | |
| parent | [IA64] Fix spinaphore down_spin() (diff) | |
| download | linux-1e31b0ffbb3b10133044e9c4bec4bd4b3f278229.tar.xz linux-1e31b0ffbb3b10133044e9c4bec4bd4b3f278229.zip | |
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()
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ia64/mm/tlb.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/mm/tlb.c b/arch/ia64/mm/tlb.c index 5dfd916e9ea6..7b3cdc6c6d91 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(); |