[PATCH 13/29] modpost: load KBUILD_EXTRA_SYMBOLS files in order

Masahiro Yamada
2020-05-17T09:49:35Z

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 <masahiroy@kernel.org>
---

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 cd3cb781a2e7..dc8f15f10da0 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -2559,8 +2559,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) {
@@ -2570,11 +2570,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;
@@ -2614,10 +2612,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)
--
2.25.1