diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-22 14:45:02 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-07-22 14:45:02 -0400 |
| commit | 2851785deb1b9c745a3fabc7e395c966878509b9 (patch) | |
| tree | e7f103fd00ab88758b7f2c45ecf0275dd045bc34 | |
| parent | e916beab22e00d95345bfa4f48981f2c88885f61 (diff) | |
| parent | 0327559151c6886814d6d5b373b4bf6de63fb9f6 (diff) | |
Merge branch 'x86/auditsyscall' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-roland
* 'x86/auditsyscall' of git://git.kernel.org/pub/scm/linux/kernel/git/frob/linux-2.6-roland:
x86: auditsyscall: fix fastpath return value after reschedule
| -rw-r--r-- | arch/x86/kernel/entry_64.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index 0697ff139837..4db7c4d12ffa 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S | |||
| @@ -571,8 +571,8 @@ auditsys: | |||
| 571 | * masked off. | 571 | * masked off. |
| 572 | */ | 572 | */ |
| 573 | sysret_audit: | 573 | sysret_audit: |
| 574 | movq %rax,%rsi /* second arg, syscall return value */ | 574 | movq RAX-ARGOFFSET(%rsp),%rsi /* second arg, syscall return value */ |
| 575 | cmpq $0,%rax /* is it < 0? */ | 575 | cmpq $0,%rsi /* is it < 0? */ |
| 576 | setl %al /* 1 if so, 0 if not */ | 576 | setl %al /* 1 if so, 0 if not */ |
| 577 | movzbl %al,%edi /* zero-extend that into %edi */ | 577 | movzbl %al,%edi /* zero-extend that into %edi */ |
| 578 | inc %edi /* first arg, 0->1(AUDITSC_SUCCESS), 1->2(AUDITSC_FAILURE) */ | 578 | inc %edi /* first arg, 0->1(AUDITSC_SUCCESS), 1->2(AUDITSC_FAILURE) */ |