summaryrefslogtreecommitdiff
path: root/arch/x86/kernel/cpu/bugs.c
diff options
context:
space:
mode:
authorSumit Semwal <sumit.semwal@linaro.org>2018-01-04 09:15:45 +0530
committerSumit Semwal <sumit.semwal@linaro.org>2018-01-04 09:15:45 +0530
commit8d13ea761e92d9f28f0cc474d8c2f411bcd2d08b (patch)
tree81e1736f996702e84c4372a5094841af049fb01b /arch/x86/kernel/cpu/bugs.c
parent79202ff9eb5cb9515b2fea57ad5bfbcfe78279b6 (diff)
parente68d6189c7872b2b3731276bda5f5e0c8d5ba644 (diff)
Merge remote-tracking branch 'stable/linux-4.4.y' into lts-4.4.y-hikey4.4.109-hikey
Diffstat (limited to 'arch/x86/kernel/cpu/bugs.c')
-rw-r--r--arch/x86/kernel/cpu/bugs.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index bd17db15a2c1..0b6124315441 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -19,6 +19,14 @@
void __init check_bugs(void)
{
+#ifdef CONFIG_X86_32
+ /*
+ * Regardless of whether PCID is enumerated, the SDM says
+ * that it can't be enabled in 32-bit mode.
+ */
+ setup_clear_cpu_cap(X86_FEATURE_PCID);
+#endif
+
identify_boot_cpu();
#ifndef CONFIG_SMP
pr_info("CPU: ");