From 3e2b50d362de70c513253edcead700fabd8a5d45 Mon Sep 17 00:00:00 2001 From: Alexander van Heukelum Date: Fri, 26 Sep 2008 14:03:03 +0200 Subject: [PATCH] --- yaml --- r: 113539 b: refs/heads/master c: 7e61a7932495e37685e95ec9a59ad08810dec959 h: refs/heads/master i: 113537: b4dcc434deede3ec908df3b2f2310b15298c4df9 113535: dcfe9fd81e15347830438ebe6ef0ea521f2d66d9 v: v3 --- [refs] | 2 +- trunk/arch/x86/kernel/entry_64.S | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 06278c84ce99..288844ff284e 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6b11d4ef3e4d6ce83fb177aa50fdf385abb17d1a +refs/heads/master: 7e61a7932495e37685e95ec9a59ad08810dec959 diff --git a/trunk/arch/x86/kernel/entry_64.S b/trunk/arch/x86/kernel/entry_64.S index 963b35b81bcc..977c8ea66028 100644 --- a/trunk/arch/x86/kernel/entry_64.S +++ b/trunk/arch/x86/kernel/entry_64.S @@ -939,6 +939,9 @@ END(spurious_interrupt) .if \ist movq %gs:pda_data_offset, %rbp .endif + .if \irqtrace + TRACE_IRQS_OFF + .endif movq %rsp,%rdi movq ORIG_RAX(%rsp),%rsi movq $-1,ORIG_RAX(%rsp)