]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
powerpc/64e: Fix bogus usage of WARN_ONCE()
authorMichael Ellerman <mpe@ellerman.id.au>
Wed, 15 Feb 2017 09:24:25 +0000 (20:24 +1100)
committerMichael Ellerman <mpe@ellerman.id.au>
Wed, 15 Feb 2017 09:24:25 +0000 (20:24 +1100)
WARN_ONCE() takes a condition and a format string. We were passing a
constant string as the condition, and the function name as the format
string. It would work, but the message would be just the function name.

Fix it by just using WARN_ONCE() directly instead of if (x) WARN_ONCE().

Noticed-by: Geliang Tang <geliangtang@163.com>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
arch/powerpc/kernel/setup_64.c

index b9855f1b290af32b4392cf8ad35e0c13d8e1db54..adf2084f214b2bd01d5aa3ef2a613e66b7b66a05 100644 (file)
@@ -113,14 +113,12 @@ void __init setup_tlb_core_data(void)
                 * If we have threads, we need either tlbsrx.
                 * or e6500 tablewalk mode, or else TLB handlers
                 * will be racy and could produce duplicate entries.
+                * Should we panic instead?
                 */
-               if (smt_enabled_at_boot >= 2 &&
-                   !mmu_has_feature(MMU_FTR_USE_TLBRSRV) &&
-                   book3e_htw_mode != PPC_HTW_E6500) {
-                       /* Should we panic instead? */
-                       WARN_ONCE("%s: unsupported MMU configuration -- expect problems\n",
-                                 __func__);
-               }
+               WARN_ONCE(smt_enabled_at_boot >= 2 &&
+                         !mmu_has_feature(MMU_FTR_USE_TLBRSRV) &&
+                         book3e_htw_mode != PPC_HTW_E6500,
+                         "%s: unsupported MMU configuration\n", __func__);
        }
 }
 #endif