---

yaml --- r: 99536 b: refs/heads/master c: 2956a35 h: refs/heads/master v: v3
git-mirror · May 27, 2008 · c94cd21 · c94cd21
1 parent 6e15d1b
commit c94cd21
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 349c709f42453707f74bece0d9d35ee5b3842893
+refs/heads/master: 2956a3511c8c5dccb1d4739ead17c7c3c23a24b7
diff --git a/trunk/arch/x86/xen/enlighten.c b/trunk/arch/x86/xen/enlighten.c
@@ -648,8 +648,10 @@ static unsigned long xen_read_cr2_direct(void)
 
 static void xen_write_cr4(unsigned long cr4)
 {
-	/* Just ignore cr4 changes; Xen doesn't allow us to do
-	   anything anyway. */
+	cr4 &= ~X86_CR4_PGE;
+	cr4 &= ~X86_CR4_PSE;
+
+	native_write_cr4(cr4);
 }
 
 static unsigned long xen_read_cr3(void)