Patchwork [Oneiric,SRU] Revert "UBUNTU: SAUCE: fix pv-ops for legacy Xen"

login
register
mail settings
Submitter Stefan Bader
Date Sept. 21, 2012, 3:28 p.m.
Message ID <1348241284-14489-3-git-send-email-stefan.bader@canonical.com>
Download mbox | patch
Permalink /patch/185789/
State New
Headers show

Comments

Stefan Bader - Sept. 21, 2012, 3:28 p.m.
This reverts commit 3f3fba59aa5773836d94799d10b692f9b7ea16a0.

It turned out that since 2.6.39 the Xen code in the kernel would
not try to set OSXSAVE in CR4 to find out whether the feature is
supported. Instead it relies on OSXSAVE being set by the HV in
the cpuid bits (which will only happen if supported).

BugLink: http://bugs.launchpad.net/bugs/1044550

Signed-off-by: Stefan Bader <stefan.bader@canonical.com>
---
 arch/x86/xen/enlighten.c |    1 -
 1 file changed, 1 deletion(-)

Patch

diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c
index 45c27dd..f70bb3d 100644
--- a/arch/x86/xen/enlighten.c
+++ b/arch/x86/xen/enlighten.c
@@ -818,7 +818,6 @@  static void xen_write_cr4(unsigned long cr4)
 {
 	cr4 &= ~X86_CR4_PGE;
 	cr4 &= ~X86_CR4_PSE;
-	cr4 &= ~X86_CR4_OSXSAVE;
 
 	native_write_cr4(cr4);
 }