From eb1ebf075fd8988b6539015ac6419f1e691c479f Mon Sep 17 00:00:00 2001 From: Alexander van Heukelum Date: Fri, 26 Sep 2008 14:03:02 +0200 Subject: [PATCH] --- yaml --- r: 113538 b: refs/heads/master c: 6b11d4ef3e4d6ce83fb177aa50fdf385abb17d1a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/entry_64.S | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 69b0b0ef0a23..06278c84ce99 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2e42060c19cb79adacc48beb5e9ec5361df976a2 +refs/heads/master: 6b11d4ef3e4d6ce83fb177aa50fdf385abb17d1a diff --git a/trunk/arch/x86/kernel/entry_64.S b/trunk/arch/x86/kernel/entry_64.S index 25bb3f9b2552..963b35b81bcc 100644 --- a/trunk/arch/x86/kernel/entry_64.S +++ b/trunk/arch/x86/kernel/entry_64.S @@ -1065,7 +1065,8 @@ KPROBE_ENTRY(error_entry) je error_kernelspace error_swapgs: SWAPGS -error_sti: +error_sti: + TRACE_IRQS_OFF movq %rdi,RDI(%rsp) CFI_REL_OFFSET rdi,RDI movq %rsp,%rdi