From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jeremy Fitzhardinge Subject: [PATCH 3/5] xen: deal with NMI's use of IST too Date: Thu, 07 May 2009 11:56:39 -0700 Message-ID: <4A032EE7.3050004@goop.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com Cc: Ingo Molnar , the arch/x86 maintainers , Linus Torvalds , Xen-devel List-Id: xen-devel@lists.xenproject.org NMI uses the IST, and Xen will also deal with it. Signed-off-by: Jeremy Fitzhardinge --- arch/x86/xen/enlighten.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 88f3aa4..b88ecc3 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -451,7 +451,8 @@ static int cvt_gate_to_trap(int vector, const gate_desc *val, else if (addr == (unsigned long)int3) addr = (unsigned long)xen_int3; else if (addr == (unsigned long)double_fault || - addr == (unsigned long)stack_segment) { + addr == (unsigned long)stack_segment || + addr == (unsigned long)nmi) { /* Don't need to handle these */ return 0; #ifdef CONFIG_X86_MCE -- 1.6.0.6