svn commit: r187221 - head/sys/amd64/amd64

[Konstantin Belousov]

Author: kib
Date: Wed Jan 14 14:20:08 2009
New Revision: 187221
URL: http://svn.freebsd.org/changeset/base/187221

Log:
  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

Modified:
  head/sys/amd64/amd64/exception.S

Modified: head/sys/amd64/amd64/exception.S
==============================================================================
--- head/sys/amd64/amd64/exception.S	Wed Jan 14 13:46:01 2009	(r187220)
+++ head/sys/amd64/amd64/exception.S	Wed Jan 14 14:20:08 2009	(r187221)
@@ -494,6 +494,7 @@ outofnmi:
 	movq	%rsp,%rdx			/* frame */
 	sti
 	call	*%rax
+	cli
 nocallchain:
 #endif
 	testl	%ebx,%ebx