]> git.baikalelectronics.ru Git - kernel.git/commitdiff
objtool: Add a missing comma to avoid string concatenation
authorEric W. Biederman <ebiederm@xmission.com>
Thu, 2 Feb 2023 04:42:43 +0000 (20:42 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 6 Feb 2023 06:52:49 +0000 (07:52 +0100)
commit fbe2fe8162822da7582b5ca099f36b31bc40e7ca upstream.

Recently the kbuild robot reported two new errors:

>> lib/kunit/kunit-example-test.o: warning: objtool: .text.unlikely: unexpected end of section
>> arch/x86/kernel/dumpstack.o: warning: objtool: oops_end() falls through to next function show_opcodes()

I don't know why they did not occur in my test setup but after digging
it I realized I had accidentally dropped a comma in
tools/objtool/check.c when I renamed rewind_stack_do_exit to
rewind_stack_and_make_dead.

Add that comma back to fix objtool errors.

Link: https://lkml.kernel.org/r/202112140949.Uq5sFKR1-lkp@intel.com
Fixes: e60b6fffca7b ("exit: Add and use make_task_dead.")
Reported-by: kernel test robot <lkp@intel.com>
Signed-off-by: "Eric W. Biederman" <ebiederm@xmission.com>
Signed-off-by: Eric Biggers <ebiggers@google.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
tools/objtool/check.c

index 14be7d261ae7a5ca291ca9fdb210136b2c1e4247..dfd67243faac0d63665e373c93c87be6e420c470 100644 (file)
@@ -144,7 +144,7 @@ static bool __dead_end_function(struct objtool_file *file, struct symbol *func,
                "fortify_panic",
                "usercopy_abort",
                "machine_real_restart",
-               "rewind_stack_and_make_dead"
+               "rewind_stack_and_make_dead",
                "cpu_bringup_and_idle",
        };