diff options
| author | Ingo Molnar | 2010-05-07 11:30:29 +0200 |
|---|---|---|
| committer | Ingo Molnar | 2010-05-07 11:30:30 +0200 |
| commit | cce913178118b0b36742eb7544c2b38a0c957ee7 (patch) | |
| tree | 25a6d7b4e01fea2932e6e2962a75f7a3d8c19a4f /arch/x86/lib | |
| parent | perf: Fix check at end of event search (diff) | |
| parent | perf: Fix exit() vs PERF_FORMAT_GROUP (diff) | |
| download | kernel-qcow2-linux-cce913178118b0b36742eb7544c2b38a0c957ee7.tar.gz kernel-qcow2-linux-cce913178118b0b36742eb7544c2b38a0c957ee7.tar.xz kernel-qcow2-linux-cce913178118b0b36742eb7544c2b38a0c957ee7.zip | |
Merge branch 'perf/urgent' into perf/core
Merge reason: Resolve patch dependency
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/lib')
| -rw-r--r-- | arch/x86/lib/rwsem_64.S | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/lib/rwsem_64.S b/arch/x86/lib/rwsem_64.S index 15acecf0d7aa..41fcf00e49df 100644 --- a/arch/x86/lib/rwsem_64.S +++ b/arch/x86/lib/rwsem_64.S @@ -60,7 +60,7 @@ ENTRY(call_rwsem_down_write_failed) ENDPROC(call_rwsem_down_write_failed) ENTRY(call_rwsem_wake) - decw %dx /* do nothing if still outstanding active readers */ + decl %edx /* do nothing if still outstanding active readers */ jnz 1f save_common_regs movq %rax,%rdi |