leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modpost: load KBUILD_EXTRA_SYMBOLS files in order

Browse Source 
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>
This commit is contained in:
Masahiro Yamada
2020-06-01 14:57:04 +09:00
parent 4e5ab74c3c
commit 2beee86899
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
scripts/mod/modpost.c
View File

@@ -2555,8 +2555,8 @@ int main(int argc, char **argv)
int opt; int opt;
int err; int err;
int n; int n;
struct ext_sym_list *extsym_iter;
struct ext_sym_list *extsym_start = NULL; 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) { while ((opt = getopt(argc, argv, "i:e:mnsT:o:awENd:")) != -1) {
switch (opt) { switch (opt) {
@@ -2566,11 +2566,9 @@ int main(int argc, char **argv)
break; break;
case 'e': case 'e':
external_module = 1; external_module = 1;
extsym_iter = *extsym_iter = NOFAIL(calloc(1, sizeof(**extsym_iter)));
NOFAIL(malloc(sizeof(*extsym_iter))); (*extsym_iter)->file = optarg;
extsym_iter->next = extsym_start; extsym_iter = &(*extsym_iter)->next;
extsym_iter->file = optarg;
extsym_start = extsym_iter;
break; break;
case 'm': case 'm':
modversions = 1; modversions = 1;
@@ -2610,10 +2608,12 @@ int main(int argc, char **argv)
if (kernel_read) if (kernel_read)
read_dump(kernel_read, 1); read_dump(kernel_read, 1);
while (extsym_start) { while (extsym_start) {
struct ext_sym_list *tmp;
read_dump(extsym_start->file, 0); read_dump(extsym_start->file, 0);
extsym_iter = extsym_start->next; tmp = extsym_start->next;
free(extsym_start); free(extsym_start);
extsym_start = extsym_iter; extsym_start = tmp;
} }
while (optind < argc) while (optind < argc)