From a353a3455eb2fdbcb0aeae2a68b6811c360e17d2 Mon Sep 17 00:00:00 2001
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Wed, 14 Jan 2009 14:20:08 +0000
Subject: [PATCH] Disable interrupts, if they were enabled, before doing
 swapgs. Otherwise, interrupt may happen while we run with kernel CS and
 usermode gsbase.

Reviewed by:	jeff
MFC after:	1 week
---
 sys/amd64/amd64/exception.S | 1 +
 1 file changed, 1 insertion(+)

diff --git a/sys/amd64/amd64/exception.S b/sys/amd64/amd64/exception.S
index 80308a90fac..1c098e4cfdf 100644
--- a/sys/amd64/amd64/exception.S
+++ b/sys/amd64/amd64/exception.S
@@ -494,6 +494,7 @@ outofnmi:
 	movq	%rsp,%rdx			/* frame */
 	sti
 	call	*%rax
+	cli
 nocallchain:
 #endif
 	testl	%ebx,%ebx