From patchwork Tue Sep 4 15:08:02 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefan Bader X-Patchwork-Id: 181601 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 388F32C008C for ; Wed, 5 Sep 2012 01:08:15 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1T8uiS-0007On-Er; Tue, 04 Sep 2012 15:07:00 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1T8uiQ-0007OS-0g for kernel-team@lists.ubuntu.com; Tue, 04 Sep 2012 15:06:58 +0000 Received: from p5b2e4f3f.dip.t-dialin.net ([91.46.79.63] helo=canonical.com) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1T8ujV-0001PR-Nl for kernel-team@lists.ubuntu.com; Tue, 04 Sep 2012 15:08:05 +0000 From: Stefan Bader To: kernel-team@lists.ubuntu.com Subject: [PATCH 1/2] Revert "UBUNTU: SAUCE: fix pv-ops for legacy Xen" Date: Tue, 4 Sep 2012 17:08:02 +0200 Message-Id: <1346771283-8881-2-git-send-email-stefan.bader@canonical.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1346771283-8881-1-git-send-email-stefan.bader@canonical.com> References: <1346771283-8881-1-git-send-email-stefan.bader@canonical.com> X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com This reverts commit 57bb316c938a9ad65a8093f0584fd22eda88521f. BugLink: http://bugs.launchpad.net/bugs/1044550 Signed-off-by: Stefan Bader --- arch/x86/xen/enlighten.c | 1 - 1 file changed, 1 deletion(-) diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 6ce1fae..bdf0883 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -869,7 +869,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); }