From e1415e2230f7b58d3ea8290245d3118b9e397018 Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Thu, 24 Jul 2008 13:48:58 -0700
Subject: [PATCH] --- yaml --- r: 113232 b: refs/heads/master c:
 d89961e2dc87b6e30b8e3f60bd2af5cd92cf4643 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index ea757f198d4d..108c4c2d8d7c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: fde28e8f49ed86e771667a3fe81fcc25c93ede8e
+refs/heads/master: d89961e2dc87b6e30b8e3f60bd2af5cd92cf4643
diff --git a/trunk/arch/x86/xen/enlighten.c b/trunk/arch/x86/xen/enlighten.c
index b011e4a5dbbe..b795470ec069 100644
--- a/trunk/arch/x86/xen/enlighten.c
+++ b/trunk/arch/x86/xen/enlighten.c
@@ -854,6 +854,19 @@ static int xen_write_msr_safe(unsigned int msr, unsigned low, unsigned high)
 			ret = -EFAULT;
 		break;
 #endif
+
+	case MSR_STAR:
+	case MSR_CSTAR:
+	case MSR_LSTAR:
+	case MSR_SYSCALL_MASK:
+	case MSR_IA32_SYSENTER_CS:
+	case MSR_IA32_SYSENTER_ESP:
+	case MSR_IA32_SYSENTER_EIP:
+		/* Fast syscall setup is all done in hypercalls, so
+		   these are all ignored.  Stub them out here to stop
+		   Xen console noise. */
+		break;
+
 	default:
 		ret = native_write_msr_safe(msr, low, high);
 	}