From 24ebfa74dbf581935f5eb05d34518c4ab18aa9f6 Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Sat, 16 Apr 2005 15:25:04 -0700 Subject: [PATCH] --- yaml --- r: 84 b: refs/heads/master c: cdd219cd1f9e657aead247dfa1ecfdeb37efdf70 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86_64/kernel/entry.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index fb463113eeb0..f33e3536028d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6fefb0d17599d63e9d30c23bcbe2d4e06477cd55 +refs/heads/master: cdd219cd1f9e657aead247dfa1ecfdeb37efdf70 diff --git a/trunk/arch/x86_64/kernel/entry.S b/trunk/arch/x86_64/kernel/entry.S index 3e888c2e5a06..887c5f017d28 100644 --- a/trunk/arch/x86_64/kernel/entry.S +++ b/trunk/arch/x86_64/kernel/entry.S @@ -284,6 +284,7 @@ int_careful: pushq %rdi call schedule popq %rdi + cli jmp int_with_check /* handle signals and tracing -- both require a full stack frame */ @@ -453,7 +454,6 @@ retint_check: andl %edi,%edx jnz retint_careful retint_swapgs: - cli swapgs retint_restore_args: cli