Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932886AbbHJUfr (ORCPT ); Mon, 10 Aug 2015 16:35:47 -0400 Received: from userp1040.oracle.com ([156.151.31.81]:28131 "EHLO userp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932749AbbHJUfD (ORCPT ); Mon, 10 Aug 2015 16:35:03 -0400 From: Boris Ostrovsky To: david.vrabel@citrix.com, konrad.wilk@oracle.com Cc: kevin.tian@intel.com, jbeulich@suse.com, dietmar.hahn@ts.fujitsu.com, stefano.stabellini@eu.citrix.com, julien.grall@citrix.com, xen-devel@lists.xen.org, linux-kernel@vger.kernel.org, boris.ostrovsky@oracle.com Subject: [PATCH v7 7/7] xen/x86: Don't try to set PCE bit in CR4 Date: Mon, 10 Aug 2015 16:34:38 -0400 Message-Id: <1439238878-22176-8-git-send-email-boris.ostrovsky@oracle.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1439238878-22176-1-git-send-email-boris.ostrovsky@oracle.com> References: <1439238878-22176-1-git-send-email-boris.ostrovsky@oracle.com> X-Source-IP: userv0022.oracle.com [156.151.31.74] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1002 Lines: 31 Since VPMU code emulates RDPMC instruction with RDMSR and because hypervisor does not emulate it there is no reason to try setting CR4's PCE bit (and the hypervisor will warn on seeing it set). Signed-off-by: Boris Ostrovsky --- arch/x86/xen/enlighten.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/arch/x86/xen/enlighten.c b/arch/x86/xen/enlighten.c index 623f8ad..d9e12e3 100644 --- a/arch/x86/xen/enlighten.c +++ b/arch/x86/xen/enlighten.c @@ -971,8 +971,7 @@ static void xen_write_cr0(unsigned long cr0) static void xen_write_cr4(unsigned long cr4) { - cr4 &= ~X86_CR4_PGE; - cr4 &= ~X86_CR4_PSE; + cr4 &= ~(X86_CR4_PGE | X86_CR4_PSE | X86_CR4_PCE); native_write_cr4(cr4); } -- 1.8.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/