From 59903ab464936af98467126d11d51436b1acddf9 Mon Sep 17 00:00:00 2001 From: Jan Beulich Date: Tue, 29 Nov 2011 10:54:22 +0000 Subject: [PATCH] --- yaml --- r: 277450 b: refs/heads/master c: 70ea6855d368588a7f1b0242ab83ca6fe2e2ff16 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/entry_64.S | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 2f3a987a10c7..1ff6fbad2a4a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e9a9eca517d4cd94e816538efc400257e34bc63e +refs/heads/master: 70ea6855d368588a7f1b0242ab83ca6fe2e2ff16 diff --git a/trunk/arch/x86/kernel/entry_64.S b/trunk/arch/x86/kernel/entry_64.S index faf8d5e74b0b..ab4b7ffd526d 100644 --- a/trunk/arch/x86/kernel/entry_64.S +++ b/trunk/arch/x86/kernel/entry_64.S @@ -411,7 +411,7 @@ ENTRY(ret_from_fork) RESTORE_REST testl $3, CS-ARGOFFSET(%rsp) # from kernel_thread? - je int_ret_from_sys_call + jz retint_restore_args testl $_TIF_IA32, TI_flags(%rcx) # 32-bit compat task needs IRET jnz int_ret_from_sys_call @@ -612,8 +612,6 @@ tracesys: GLOBAL(int_ret_from_sys_call) DISABLE_INTERRUPTS(CLBR_NONE) TRACE_IRQS_OFF - testl $3,CS-ARGOFFSET(%rsp) - je retint_restore_args movl $_TIF_ALLWORK_MASK,%edi /* edi: mask to check */ GLOBAL(int_with_check)