1 files changed, 8 insertions, 15 deletions

diff --git a/arch/powerpc/kernel/security.c b/arch/powerpc/kernel/security.c
index 9b8631533e02..b33bafb8fcea 100644
--- a/arch/powerpc/kernel/security.c
+++ b/arch/powerpc/kernel/security.c
@@ -190,29 +190,22 @@ ssize_t cpu_show_spectre_v2(struct device *dev, struct device_attribute *attr, c
         bcs = security_ftr_enabled(SEC_FTR_BCCTRL_SERIALISED);
         ccd = security_ftr_enabled(SEC_FTR_COUNT_CACHE_DISABLED);
 
-        if (bcs || ccd || count_cache_flush_type != COUNT_CACHE_FLUSH_NONE) {
-                bool comma = false;
+        if (bcs || ccd) {
                 seq_buf_printf(&s, "Mitigation: ");
 
-                if (bcs) {
+                if (bcs)
                         seq_buf_printf(&s, "Indirect branch serialisation (kernel only)");
-                        comma = true;
-                }
 
-                if (ccd) {
-                        if (comma)
-                                seq_buf_printf(&s, ", ");
-                        seq_buf_printf(&s, "Indirect branch cache disabled");
-                        comma = true;
-                }
-
-                if (comma)
+                if (bcs && ccd)
                         seq_buf_printf(&s, ", ");
 
-                seq_buf_printf(&s, "Software count cache flush");
+                if (ccd)
+                        seq_buf_printf(&s, "Indirect branch cache disabled");
+        } else if (count_cache_flush_type != COUNT_CACHE_FLUSH_NONE) {
+                seq_buf_printf(&s, "Mitigation: Software count cache flush");
 
                 if (count_cache_flush_type == COUNT_CACHE_FLUSH_HW)
-                        seq_buf_printf(&s, "(hardware accelerated)");
+                        seq_buf_printf(&s, " (hardware accelerated)");
         } else if (btb_flush_enabled) {
                 seq_buf_printf(&s, "Mitigation: Branch predictor state flush");
         } else {