From mboxrd@z Thu Jan 1 00:00:00 1970 From: Zhuo Song Subject: [PATCH] xc_cpuid_x86.c: Remove the condition for masking NX in vendor specific functions Date: Sat, 6 Sep 2014 01:55:22 +0800 Message-ID: <1409939722-18671-1-git-send-email-alfred.z.song@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: xen-devel@lists.xen.org Cc: ian.campbell@citrix.com, stefano.stabellini@eu.citrix.com, jinsong.liu@alibaba-inc.com, ian.jackson@eu.citrix.com, boyu.mt@alibaba-inc.com, JBeulich@suse.com List-Id: xen-devel@lists.xenproject.org Since the architectural logic has help cover it, amd_xc_cpuid_policy and intel_xc_cpuid_policy are unnecessary to do it redundantly. Signed-off-by: Zhuo Song --- tools/libxc/xc_cpuid_x86.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/libxc/xc_cpuid_x86.c b/tools/libxc/xc_cpuid_x86.c index 6b81641..9add109 100644 --- a/tools/libxc/xc_cpuid_x86.c +++ b/tools/libxc/xc_cpuid_x86.c @@ -116,7 +116,7 @@ static void amd_xc_cpuid_policy( bitmaskof(X86_FEATURE_TBM) | bitmaskof(X86_FEATURE_DBEXT)); regs[3] &= (0x0183f3ff | /* features shared with 0x00000001:EDX */ - (is_pae ? bitmaskof(X86_FEATURE_NX) : 0) | + bitmaskof(X86_FEATURE_NX) | (is_64bit ? bitmaskof(X86_FEATURE_LM) : 0) | bitmaskof(X86_FEATURE_SYSCALL) | bitmaskof(X86_FEATURE_MP) | @@ -201,7 +201,7 @@ static void intel_xc_cpuid_policy( regs[2] &= (is_64bit ? bitmaskof(X86_FEATURE_LAHF_LM) : 0) | bitmaskof(X86_FEATURE_3DNOWPREFETCH) | bitmaskof(X86_FEATURE_ABM); - regs[3] &= ((is_pae ? bitmaskof(X86_FEATURE_NX) : 0) | + regs[3] &= (bitmaskof(X86_FEATURE_NX) | (is_64bit ? bitmaskof(X86_FEATURE_LM) : 0) | (is_64bit ? bitmaskof(X86_FEATURE_SYSCALL) : 0) | (is_64bit ? bitmaskof(X86_FEATURE_RDTSCP) : 0)); -- 1.8.5.2 (Apple Git-48)