Merge tag 'x86_mm_for_6.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

[platform/kernel/linux-rpi.git] / arch / x86 / mm / init.c

diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c
index ffa25e9..679893e 100644 (file)
--- a/arch/x86/mm/init.c
+++ b/arch/x86/mm/init.c
@@ -306,15 +306,6 @@ static void setup_pcid(void)
                 * start_secondary().
                 */
                cr4_set_bits(X86_CR4_PCIDE);
-
-               /*
-                * INVPCID's single-context modes (2/3) only work if we set
-                * X86_CR4_PCIDE, *and* we INVPCID support.  It's unusable
-                * on systems that have X86_CR4_PCIDE clear, or that have
-                * no INVPCID support at all.
-                */
-               if (boot_cpu_has(X86_FEATURE_INVPCID))
-                       setup_force_cpu_cap(X86_FEATURE_INVPCID_SINGLE);
        } else {
                /*
                 * flush_tlb_all(), as currently implemented, won't work if