From 32fd9a118bb9d9cf56a46d609265c67d3c7a2a1b Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Tue, 8 Jul 2008 15:07:01 -0700
Subject: [PATCH] --- yaml --- r: 104433 b: refs/heads/master c:
 952d1d7055c8cbf95b4ad2f90be5ed37db8a48ee h: refs/heads/master i:   104431:
 25bce7acab4611e83df3133bea7150beda62da73 v: v3

---
 [refs]                         | 2 +-
 trunk/arch/x86/xen/enlighten.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 8d84d07e957e..6d901d6bec4a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 997409d3d0bd6894f33e31ced251c0fdf523aa14
+refs/heads/master: 952d1d7055c8cbf95b4ad2f90be5ed37db8a48ee
diff --git a/trunk/arch/x86/xen/enlighten.c b/trunk/arch/x86/xen/enlighten.c
index 9d94483b3b5e..8b60982e457a 100644
--- a/trunk/arch/x86/xen/enlighten.c
+++ b/trunk/arch/x86/xen/enlighten.c
@@ -1076,6 +1076,9 @@ static const struct pv_cpu_ops xen_cpu_ops __initdata = {
 	.set_iopl_mask = xen_set_iopl_mask,
 	.io_delay = xen_io_delay,
 
+	/* Xen takes care of %gs when switching to usermode for us */
+	.swapgs = paravirt_nop,
+
 	.lazy_mode = {
 		.enter = paravirt_enter_lazy_cpu,
 		.leave = xen_leave_lazy,