From patchwork Mon Jun 1 05:57:04 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Masahiro Yamada X-Patchwork-Id: 11581311 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0ACFF1667 for ; Mon, 1 Jun 2020 05:58:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DD1F920734 for ; Mon, 1 Jun 2020 05:58:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590991101; bh=bEb5bIrmULG4+WBmjbTZlcDI8ee+HrIyNW5WT+Y15ds=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=jHjbttd3LYY4igTwIJ5yKosfl9HXs7+lMbi26k603J6HZWM38uRoeyXvtPzL089pd LnmwdsJugvL0NBeqpnZwUO40JP/wvuWsz9FAmHS3jYu3lXc3ovuiZ1LDEnALj0bOpr /aTVioKD52qhEzh6+2Y82bNK2HIprPw7oq5a3kag= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726126AbgFAF6V (ORCPT ); Mon, 1 Jun 2020 01:58:21 -0400 Received: from conuserg-07.nifty.com ([210.131.2.74]:39998 "EHLO conuserg-07.nifty.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726151AbgFAF6U (ORCPT ); Mon, 1 Jun 2020 01:58:20 -0400 Received: from oscar.flets-west.jp (softbank126090202047.bbtec.net [126.90.202.47]) (authenticated) by conuserg-07.nifty.com with ESMTP id 0515vaLn023694; Mon, 1 Jun 2020 14:57:41 +0900 DKIM-Filter: OpenDKIM Filter v2.10.3 conuserg-07.nifty.com 0515vaLn023694 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nifty.com; s=dec2015msa; t=1590991061; bh=8omp1ak2zJDPcGwE4krnaIiaOAFMT3vUAPBeNO3RNiQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Kb20fRFsITf3rTNBDP5MnKPt/e5Kd9qJrYfLdFpeL7CJOSqREo+lsE8SdaMeUnP1r nF8Lk/LM7CzF3V4mwD6FXhTCXgSigkP6FoWmm2r3d1JuS77rWiJeMExFS/CTuprAI5 JTJij6WM3E33tYEE1lz34x3RiS6Cr1DAAwt4yhhxttr9sRuaY0KgmUBIktuIogVqvG b/rDaAT/253Xs1vvTcZ9pi5UOAzY72bRL4J0ZYxonHHQLnd3s5ErwkOIwCZqKVGBKj j1kQw50b8KsNqFw9nsylNw3ISGjTqpXvTGeKqI7T+/syNab5W71MM12SNltRgImqRz PoGpMzGaDCCJw== X-Nifty-SrcIP: [126.90.202.47] From: Masahiro Yamada To: linux-kbuild@vger.kernel.org Cc: Masahiro Yamada Subject: [PATCH 10/37] modpost: load KBUILD_EXTRA_SYMBOLS files in order Date: Mon, 1 Jun 2020 14:57:04 +0900 Message-Id: <20200601055731.3006266-10-masahiroy@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200601055731.3006266-1-masahiroy@kernel.org> References: <20200601055731.3006266-1-masahiroy@kernel.org> MIME-Version: 1.0 Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org Currently, modpost reads extra symbol dump files in the reverse order. If '-e foo -e bar' is given, modpost reads bar, foo, in this order. This is probably not a big deal, but there is no good reason to reverse the order. Read files in the given order. Signed-off-by: Masahiro Yamada --- scripts/mod/modpost.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c index 160139508821..5224a02edbf2 100644 --- a/scripts/mod/modpost.c +++ b/scripts/mod/modpost.c @@ -2555,8 +2555,8 @@ int main(int argc, char **argv) int opt; int err; int n; - struct ext_sym_list *extsym_iter; struct ext_sym_list *extsym_start = NULL; + struct ext_sym_list **extsym_iter = &extsym_start; while ((opt = getopt(argc, argv, "i:e:mnsT:o:awENd:")) != -1) { switch (opt) { @@ -2566,11 +2566,9 @@ int main(int argc, char **argv) break; case 'e': external_module = 1; - extsym_iter = - NOFAIL(malloc(sizeof(*extsym_iter))); - extsym_iter->next = extsym_start; - extsym_iter->file = optarg; - extsym_start = extsym_iter; + *extsym_iter = NOFAIL(calloc(1, sizeof(**extsym_iter))); + (*extsym_iter)->file = optarg; + extsym_iter = &(*extsym_iter)->next; break; case 'm': modversions = 1; @@ -2610,10 +2608,12 @@ int main(int argc, char **argv) if (kernel_read) read_dump(kernel_read, 1); while (extsym_start) { + struct ext_sym_list *tmp; + read_dump(extsym_start->file, 0); - extsym_iter = extsym_start->next; + tmp = extsym_start->next; free(extsym_start); - extsym_start = extsym_iter; + extsym_start = tmp; } while (optind < argc)