diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-01 12:36:15 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-01 12:36:15 -0400 |
| commit | 1e31b0ffbb3b10133044e9c4bec4bd4b3f278229 (patch) | |
| tree | a7b30dd35e1321b93e44ae107e7fe4c43ad8c20b /arch | |
| parent | 980019d74e4b2428362b36a0506519d6d9460800 (diff) | |
| parent | b70f4e85bfc4d7000036355b714a92d5c574f1be (diff) | |
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) | |||
| 121 | ia64_invala(); | 121 | ia64_invala(); |
| 122 | 122 | ||
| 123 | for (;;) { | 123 | for (;;) { |
| 124 | asm volatile ("ld4.c.nc %0=[%1]" : "=r"(serve) : "r"(&ss->serve) : "memory"); | 124 | asm volatile ("ld8.c.nc %0=[%1]" : "=r"(serve) : "r"(&ss->serve) : "memory"); |
| 125 | if (time_before(t, serve)) | 125 | if (time_before(t, serve)) |
| 126 | return; | 126 | return; |
| 127 | cpu_relax(); | 127 | cpu_relax(); |