From 3c2dd56dbfb8c4849500001eaf67af2c999a92cf Mon Sep 17 00:00:00 2001
From: Robert Mustacchi <rm@joyent.com>
Date: Thu, 5 Nov 2015 12:10:02 -0800
Subject: [PATCH] 6439 #ss handler could look more like #np Reviewed by: Joshua
 M. Clulow <josh@sysmgr.org> Approved by: Dan McDonald <danmcd@omniti.com>

---
 usr/src/uts/intel/ia32/ml/exception.s | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/usr/src/uts/intel/ia32/ml/exception.s b/usr/src/uts/intel/ia32/ml/exception.s
index 33832749ca..e7a004efe5 100644
--- a/usr/src/uts/intel/ia32/ml/exception.s
+++ b/usr/src/uts/intel/ia32/ml/exception.s
@@ -1039,6 +1039,9 @@ make_frame:
 	 */
 	ENTRY_NP(stktrap)
 	TRAP_ERR(T_STKFLT)	/* $12 already have error code on stack */
+#if defined(__amd64)
+	SET_CPU_GSBASE
+#endif
 	jmp	cmntrap
 	SET_SIZE(stktrap)
 
-- 
2.11.4.GIT