From c60475a5619583f7ecd93aac8807e6f22c3ed5d9 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Thu, 10 Jul 2008 14:50:39 -0700 Subject: [PATCH] --- yaml --- r: 100163 b: refs/heads/master c: eca91e7838ec92e8c12122849ec7539c4765b689 h: refs/heads/master i: 100161: 460a90295f2d34183c551a8e9ccb9f6fccbcb7d4 100159: 257f13a723825efa9a4b9d0b4fef1e43440cd756 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/entry_64.S | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index c4751a1f3eec..a0bcb1503f78 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: da1f29f5dfcc8641f9ff6f3deaa9f03b57e63229 +refs/heads/master: eca91e7838ec92e8c12122849ec7539c4765b689 diff --git a/trunk/arch/x86/kernel/entry_64.S b/trunk/arch/x86/kernel/entry_64.S index 466b9284ed2f..bb4e22f4892f 100644 --- a/trunk/arch/x86/kernel/entry_64.S +++ b/trunk/arch/x86/kernel/entry_64.S @@ -306,7 +306,7 @@ sysret_signal: leaq -ARGOFFSET(%rsp),%rdi # &pt_regs -> arg1 xorl %esi,%esi # oldset -> arg2 call ptregscall_common -1: movl $_TIF_NEED_RESCHED,%edi +1: movl $_TIF_WORK_MASK,%edi /* Use IRET because user could have changed frame. This works because ptregscall_common has called FIXUP_TOP_OF_STACK. */ DISABLE_INTERRUPTS(CLBR_NONE) @@ -394,7 +394,7 @@ int_signal: movq %rsp,%rdi # &ptregs -> arg1 xorl %esi,%esi # oldset -> arg2 call do_notify_resume -1: movl $_TIF_NEED_RESCHED,%edi +1: movl $_TIF_WORK_MASK,%edi int_restore_rest: RESTORE_REST DISABLE_INTERRUPTS(CLBR_NONE) @@ -647,9 +647,8 @@ retint_signal: RESTORE_REST DISABLE_INTERRUPTS(CLBR_NONE) TRACE_IRQS_OFF - movl $_TIF_NEED_RESCHED,%edi GET_THREAD_INFO(%rcx) - jmp retint_check + jmp retint_with_reschedule #ifdef CONFIG_PREEMPT /* Returning to kernel space. Check if we need preemption */