summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMasahiro Yamada <masahiroy@kernel.org>2020-06-01 14:57:08 +0900
committerMasahiro Yamada <masahiroy@kernel.org>2020-06-06 23:38:12 +0900
commite3fb4df7fe4e8636de32a1e4ff5ebc75257f5570 (patch)
tree29bf32c1215b1b55dc22a5bc0275a3fab0580c10
parent7924799ed2ddaa393c2ef0c4cd13a81d122bffde (diff)
modpost: re-add -e to set external_module flag
Previously, the -i option had two functions; load a symbol dump file, and set the external_module flag. I want to assign a dedicate option for each of them. Going forward, the -i is used to load a symbol dump file, and the -e to set the external_module flag. With this, we will be able to use -i for loading in-kernel symbols. Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
-rw-r--r--scripts/Makefile.modpost4
-rw-r--r--scripts/mod/modpost.c6
2 files changed, 8 insertions, 2 deletions
diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
index 7e07adab929c..4d79afe997ad 100644
--- a/scripts/Makefile.modpost
+++ b/scripts/Makefile.modpost
@@ -79,6 +79,10 @@ src := $(obj)
# Include the module's Makefile to find KBUILD_EXTRA_SYMBOLS
include $(if $(wildcard $(KBUILD_EXTMOD)/Kbuild), \
$(KBUILD_EXTMOD)/Kbuild, $(KBUILD_EXTMOD)/Makefile)
+
+# modpost option for external modules
+MODPOST += -e
+
endif
# modpost options for modules (both in-kernel and external)
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index b8e521f50b2d..4a2f27d97bf1 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -2552,10 +2552,12 @@ int main(int argc, char **argv)
struct dump_list *dump_read_start = NULL;
struct dump_list **dump_read_iter = &dump_read_start;
- while ((opt = getopt(argc, argv, "i:mnsT:o:awENd:")) != -1) {
+ while ((opt = getopt(argc, argv, "ei:mnsT:o:awENd:")) != -1) {
switch (opt) {
- case 'i':
+ case 'e':
external_module = 1;
+ break;
+ case 'i':
*dump_read_iter =
NOFAIL(calloc(1, sizeof(**dump_read_iter)));
(*dump_read_iter)->file = optarg;