Merge 4.14-rc4 into staging-next

We want the staging/iio fixes in here as well to handle merge issues.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

1 files changed, 0 insertions, 8 deletions

diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c
index db684880d74a..0af86d9242da 100644
--- a/arch/x86/kernel/cpu/bugs.c
+++ b/arch/x86/kernel/cpu/bugs.c
@@ -21,14 +21,6 @@
 
 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();
 
         if (!IS_ENABLED(CONFIG_SMP)) {