summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJani Nikula <jani.nikula@intel.com>2024-05-31 11:04:54 +0200
committerAndrew Morton <akpm@linux-foundation.org>2024-06-25 07:25:04 +0200
commitf4b62423383e7a26eb1a6ce0fc52c472ed955d6f (patch)
treebb0ec46ee04a0e523c146c88b161cbc0d6efe46f
parentlib/ts: add missing MODULE_DESCRIPTION() macros (diff)
downloadlinux-f4b62423383e7a26eb1a6ce0fc52c472ed955d6f.tar.xz
linux-f4b62423383e7a26eb1a6ce0fc52c472ed955d6f.zip
kernel/panic: return early from print_tainted() when not tainted
Reduce indent to make follow-up changes slightly easier on the eyes. Link: https://lkml.kernel.org/r/01d6c03de1c9d1b52b59c652a3704a0a9886ed63.1717146197.git.jani.nikula@intel.com Signed-off-by: Jani Nikula <jani.nikula@intel.com> Reviewed-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Diffstat (limited to '')
-rw-r--r--kernel/panic.c25
1 files changed, 13 insertions, 12 deletions
diff --git a/kernel/panic.c b/kernel/panic.c
index 8bff183d6180..3edad0c6091d 100644
--- a/kernel/panic.c
+++ b/kernel/panic.c
@@ -507,22 +507,23 @@ const struct taint_flag taint_flags[TAINT_FLAGS_COUNT] = {
const char *print_tainted(void)
{
static char buf[TAINT_FLAGS_COUNT + sizeof("Tainted: ")];
+ char *s;
+ int i;
BUILD_BUG_ON(ARRAY_SIZE(taint_flags) != TAINT_FLAGS_COUNT);
- if (tainted_mask) {
- char *s;
- int i;
-
- s = buf + sprintf(buf, "Tainted: ");
- for (i = 0; i < TAINT_FLAGS_COUNT; i++) {
- const struct taint_flag *t = &taint_flags[i];
- *s++ = test_bit(i, &tainted_mask) ?
- t->c_true : t->c_false;
- }
- *s = 0;
- } else
+ if (!tainted_mask) {
snprintf(buf, sizeof(buf), "Not tainted");
+ return buf;
+ }
+
+ s = buf + sprintf(buf, "Tainted: ");
+ for (i = 0; i < TAINT_FLAGS_COUNT; i++) {
+ const struct taint_flag *t = &taint_flags[i];
+ *s++ = test_bit(i, &tainted_mask) ?
+ t->c_true : t->c_false;
+ }
+ *s = 0;
return buf;
}