Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8120FC433EF for ; Wed, 15 Dec 2021 17:38:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234735AbhLORiu (ORCPT ); Wed, 15 Dec 2021 12:38:50 -0500 Received: from out03.mta.xmission.com ([166.70.13.233]:49390 "EHLO out03.mta.xmission.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234594AbhLORit (ORCPT ); Wed, 15 Dec 2021 12:38:49 -0500 Received: from in01.mta.xmission.com ([166.70.13.51]:38374) by out03.mta.xmission.com with esmtps (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1mxYEq-00Gzy3-Ef; Wed, 15 Dec 2021 10:38:48 -0700 Received: from ip68-227-160-95.om.om.cox.net ([68.227.160.95]:42328 helo=email.froward.int.ebiederm.org.xmission.com) by in01.mta.xmission.com with esmtpsa (TLS1.3) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1mxYEp-00F8hM-Ag; Wed, 15 Dec 2021 10:38:48 -0700 From: ebiederm@xmission.com (Eric W. Biederman) To: Rong Chen Cc: kernel test robot , kbuild-all@lists.01.org, linux-kernel@vger.kernel.org References: <202112140949.Uq5sFKR1-lkp@intel.com> <87k0g7t7ry.fsf@email.froward.int.ebiederm.org> <2af5f2f0-b2db-35e3-2d7a-7fa512db19af@intel.com> <8735mutqvz.fsf@email.froward.int.ebiederm.org> Date: Wed, 15 Dec 2021 11:38:40 -0600 In-Reply-To: (Rong Chen's message of "Wed, 15 Dec 2021 13:22:21 +0800") Message-ID: <874k79sr8f.fsf_-_@email.froward.int.ebiederm.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.1 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-XM-SPF: eid=1mxYEp-00F8hM-Ag;;;mid=<874k79sr8f.fsf_-_@email.froward.int.ebiederm.org>;;;hst=in01.mta.xmission.com;;;ip=68.227.160.95;;;frm=ebiederm@xmission.com;;;spf=neutral X-XM-AID: U2FsdGVkX195EHMjx+TaH3P9lovQXdzxvEqxY73Iklg= X-SA-Exim-Connect-IP: 68.227.160.95 X-SA-Exim-Mail-From: ebiederm@xmission.com Subject: [PATCH] objtool: Add a missing comma to avoid string concatenation X-SA-Exim-Version: 4.2.1 (built Sat, 08 Feb 2020 21:53:50 +0000) X-SA-Exim-Scanned: Yes (on in01.mta.xmission.com) Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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: 0e25498f8cd4 ("exit: Add and use make_task_dead.") Reported-by: kernel test robot Signed-off-by: "Eric W. Biederman" --- For the record this is my trivial objtool fix. tools/objtool/check.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/objtool/check.c b/tools/objtool/check.c index 282273a1ffa5..3fc2c57f6124 100644 --- a/tools/objtool/check.c +++ b/tools/objtool/check.c @@ -177,7 +177,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", "kunit_try_catch_throw", "xen_start_kernel", "cpu_bringup_and_idle", -- 2.29.2