diff options
| author | Ingo Molnar <mingo@elte.hu> | 2010-05-07 05:30:29 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2010-05-07 05:30:30 -0400 |
| commit | cce913178118b0b36742eb7544c2b38a0c957ee7 (patch) | |
| tree | 25a6d7b4e01fea2932e6e2962a75f7a3d8c19a4f /arch/x86/lib | |
| parent | d9f599e1e6d019968b35d2dc63074b9e8964fa69 (diff) | |
| parent | 4fd38e4595e2f6c9d27732c042a0e16b2753049c (diff) | |
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) | |||
| 60 | ENDPROC(call_rwsem_down_write_failed) | 60 | ENDPROC(call_rwsem_down_write_failed) |
| 61 | 61 | ||
| 62 | ENTRY(call_rwsem_wake) | 62 | ENTRY(call_rwsem_wake) |
| 63 | decw %dx /* do nothing if still outstanding active readers */ | 63 | decl %edx /* do nothing if still outstanding active readers */ |
| 64 | jnz 1f | 64 | jnz 1f |
| 65 | save_common_regs | 65 | save_common_regs |
| 66 | movq %rax,%rdi | 66 | movq %rax,%rdi |