arm64: cpufeature: Fix CPU_OUT_OF_SPEC taint for uniform systems

[mirror_ubuntu-artful-kernel.git] / arch / arm64 / kernel / cpufeature.c

diff --git a/arch/arm64/kernel/cpufeature.c b/arch/arm64/kernel/cpufeature.c
index 22f554320581a18490ed2ea3594d607d6f7df948..55d5c72a507d167f1bbb72dd15b55d1627b5f154 100644 (file)
--- a/arch/arm64/kernel/cpufeature.c
+++ b/arch/arm64/kernel/cpufeature.c
@@ -639,8 +639,10 @@ void update_cpu_features(int cpu,
         * Mismatched CPU features are a recipe for disaster. Don't even
         * pretend to support them.
         */
-       pr_warn_once("Unsupported CPU feature variation detected.\n");
-       add_taint(TAINT_CPU_OUT_OF_SPEC, LOCKDEP_STILL_OK);
+       if (taint) {
+               pr_warn_once("Unsupported CPU feature variation detected.\n");
+               add_taint(TAINT_CPU_OUT_OF_SPEC, LOCKDEP_STILL_OK);
+       }
 }
 
 u64 read_sanitised_ftr_reg(u32 id)