summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Fitzhardinge <jeremy@goop.org>2007-09-18 22:46:33 -0700
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-09-19 11:24:18 -0700
commit389a3c02496dd1b399bb0efd005e9fa2be24e9ee (patch)
tree2c3189438f24c8b84ec36f6259b0dac798a1d9f6
parent248bdd5efca5a113cbf443a993c69e53d370236b (diff)
downloadlwn-389a3c02496dd1b399bb0efd005e9fa2be24e9ee.tar.gz
lwn-389a3c02496dd1b399bb0efd005e9fa2be24e9ee.zip
xen: don't bother trying to set cr4
Xen ignores all updates to cr4, and some versions will kill the domain if you try to change its value. Just ignore all changes. Signed-off-by: Jeremy Fitzhardinge <jeremy@xensource.com> Cc: Andi Kleen <ak@suse.de> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--arch/i386/xen/enlighten.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/xen/enlighten.c b/arch/i386/xen/enlighten.c
index f0c37511d8da..f01bfcd4bdee 100644
--- a/arch/i386/xen/enlighten.c
+++ b/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)