diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-07-05 10:30:55 +0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-07-05 10:30:58 +0400 |
| commit | 08f8ba07998ab1b9efcdd3f28dadf6866a605ddb (patch) | |
| tree | 8e09855446f7b0312bb729d4b539090756e57927 /arch/ia64 | |
| parent | 0879b100f3c187257729f36cba33d96ec2875766 (diff) | |
| parent | 815c4163b6c8ebf8152f42b0a5fd015cfdcedc78 (diff) | |
| download | linux-08f8ba07998ab1b9efcdd3f28dadf6866a605ddb.tar.xz | |
Merge commit 'v2.6.35-rc4' into perf/core
Merge reason: Pick up the latest perf fixes
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/ia64')
| -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(); |