[Devel] [PATCH rh7 10/11] Port diff-arch-x86-mask-cpuid-0x00000007-features-in-_proc_cpuinfo

[Vladimir Davydov]

Author: Vladimir Davydov
Email: vdavydov at parallels.com
Subject: arch: mask cpuid 0x00000007 features in /proc/cpuinfo
Date: Tue, 23 Dec 2014 15:26:28 +0300

https://jira.sw.ru/browse/PSBM-30880

Signed-off-by: Vladimir Davydov <vdavydov at parallels.com>
=============================================================================

https://jira.sw.ru/browse/PSBM-33638

Signed-off-by: Vladimir Davydov <vdavydov at virtuozzo.com>
---
 arch/x86/kernel/cpu/proc.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/arch/x86/kernel/cpu/proc.c b/arch/x86/kernel/cpu/proc.c
index ee32933617be..e5087b72d876 100644
--- a/arch/x86/kernel/cpu/proc.c
+++ b/arch/x86/kernel/cpu/proc.c
@@ -81,6 +81,11 @@ static void init_cpu_flags(void *dummy)
 		flags->val[0] &= edx;
 	}
 
+	if (c->cpuid_level >= 0x00000007) {
+		__do_cpuid_fault(0x00000007, 0, &eax, &ebx, &ecx, &edx);
+		flags->val[9] &= ebx;
+	}
+
 	if ((c->extended_cpuid_level & 0xffff0000) == 0x80000000 &&
 	    c->extended_cpuid_level >= 0x80000001) {
 		__do_cpuid_fault(0x80000001, 0, &eax, &ebx, &ecx, &edx);
-- 
2.1.4