From mboxrd@z Thu Jan 1 00:00:00 1970 From: Avi Kivity Subject: [PATCH 4/4] x86: Move NMI back to interrupt stack Date: Fri, 26 Dec 2008 16:22:24 +0200 Message-ID: <1230301344-570-5-git-send-email-avi@redhat.com> References: <1230301344-570-1-git-send-email-avi@redhat.com> Cc: jeremy@goop.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org To: Ingo Molnar , "H. Peter Anvin" Return-path: Received: from mx2.redhat.com ([66.187.237.31]:47359 "EHLO mx2.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752416AbYLZOWa (ORCPT ); Fri, 26 Dec 2008 09:22:30 -0500 In-Reply-To: <1230301344-570-1-git-send-email-avi@redhat.com> Sender: kvm-owner@vger.kernel.org List-ID: Now that interrupt stack switching is atomic, we can move the NMI handler to the interrupt stack. Signed-off-by: Avi Kivity --- arch/x86/kernel/entry_64.S | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/arch/x86/kernel/entry_64.S b/arch/x86/kernel/entry_64.S index 61c54d9..3d45880 100644 --- a/arch/x86/kernel/entry_64.S +++ b/arch/x86/kernel/entry_64.S @@ -1496,7 +1496,7 @@ ENTRY(nmi) /* paranoidentry do_nmi, 0; without TRACE_IRQS_OFF */ movq %rsp,%rdi movq $-1,%rsi - call do_nmi + call_in_irqstack do_nmi #ifdef CONFIG_TRACE_IRQFLAGS /* paranoidexit; without TRACE_IRQS_OFF */ /* ebx: no swapgs flag */ -- 1.6.0.6