Merge tag 'x86_alternatives_for_v6.10_rc1' of git://git.kernel.org/pub/scm/linux...

[linux.git] / arch / x86 / kernel / cpu / cpuid-deps.c

diff --git a/arch/x86/kernel/cpu/cpuid-deps.c b/arch/x86/kernel/cpu/cpuid-deps.c
index 946813d816bfc2948eccc823300db283f99f91d4..b7d9f530ae1646065184b1cb2350f2d77d0c697d 100644 (file)
--- a/arch/x86/kernel/cpu/cpuid-deps.c
+++ b/arch/x86/kernel/cpu/cpuid-deps.c
@@ -114,6 +114,9 @@ static void do_clear_cpu_cap(struct cpuinfo_x86 *c, unsigned int feature)
        if (WARN_ON(feature >= MAX_FEATURE_BITS))
                return;
 
+       if (boot_cpu_has(feature))
+               WARN_ON(alternatives_patched);
+
        clear_feature(c, feature);
 
        /* Collect all features to disable, handling dependencies */