public inbox for kvm@vger.kernel.org
 help / color / mirror / Atom feed
From: Avi Kivity <avi@redhat.com>
To: Ingo Molnar <mingo@elte.hu>, "H. Peter Anvin" <hpa@zytor.com>
Cc: jeremy@goop.org, linux-kernel@vger.kernel.org, kvm@vger.kernel.org
Subject: [PATCH 4/4] x86: Move NMI back to interrupt stack
Date: Fri, 26 Dec 2008 16:22:24 +0200	[thread overview]
Message-ID: <1230301344-570-5-git-send-email-avi@redhat.com> (raw)
In-Reply-To: <1230301344-570-1-git-send-email-avi@redhat.com>

Now that interrupt stack switching is atomic, we can move the NMI handler
to the interrupt stack.

Signed-off-by: Avi Kivity <avi@redhat.com>
---
 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


  parent reply	other threads:[~2008-12-26 14:22 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-12-26 14:22 [PATCH 0/4] Remove interrupt stack table usage from x86_64 kernel (v2) Avi Kivity
2008-12-26 14:22 ` [PATCH 1/4] x86: drop the use of the tss interrupt stack table (IST) Avi Kivity
2008-12-26 14:22 ` [PATCH 2/4] x86: Consolidate irq stack switching to a single macro Avi Kivity
2008-12-26 14:22 ` [PATCH 3/4] x86: Make interrupt stack switching atomic Avi Kivity
2008-12-26 14:22 ` Avi Kivity [this message]
2008-12-26 14:35 ` [PATCH 0/4] Remove interrupt stack table usage from x86_64 kernel (v2) Ingo Molnar
2008-12-26 14:38   ` Ingo Molnar
2008-12-27 21:42     ` Avi Kivity

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1230301344-570-5-git-send-email-avi@redhat.com \
    --to=avi@redhat.com \
    --cc=hpa@zytor.com \
    --cc=jeremy@goop.org \
    --cc=kvm@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox