From a7161639179e88ea0e0d8dc782f48e5a3d5ad39c Mon Sep 17 00:00:00 2001
From: Jeremy Fitzhardinge <jeremy@goop.org>
Date: Tue, 18 Sep 2007 22:46:33 -0700
Subject: [PATCH] --- yaml --- r: 65025 b: refs/heads/master c:
 389a3c02496dd1b399bb0efd005e9fa2be24e9ee h: refs/heads/master i:   65023:
 d28d8c37e3f4ff6dcc1d46d824766f7e7493564d v: v3

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

diff --git a/[refs] b/[refs]
index 09bb7d1238ae..b34e2ac1a866 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 248bdd5efca5a113cbf443a993c69e53d370236b
+refs/heads/master: 389a3c02496dd1b399bb0efd005e9fa2be24e9ee
diff --git a/trunk/arch/i386/xen/enlighten.c b/trunk/arch/i386/xen/enlighten.c
index f0c37511d8da..f01bfcd4bdee 100644
--- a/trunk/arch/i386/xen/enlighten.c
+++ b/trunk/arch/i386/xen/enlighten.c
@@ -623,8 +623,8 @@ static unsigned long xen_read_cr2_direct(void)
 
 static void xen_write_cr4(unsigned long cr4)
 {
-	/* never allow TSC to be disabled */
-	native_write_cr4(cr4 & ~X86_CR4_TSD);
+	/* Just ignore cr4 changes; Xen doesn't allow us to do
+	   anything anyway. */
 }
 
 static unsigned long xen_read_cr3(void)