modpost: remove -s option

The -s option was added by commit 8d8d8289df65 ("kbuild: do not do
section mismatch checks on vmlinux in 2nd pass").

Now that the second pass does not parse vmlinux, this option is
unneeded.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>

diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
index e47f875..4938a6f 100644 (file)
--- a/scripts/Makefile.modpost
+++ b/scripts/Makefile.modpost
@@ -62,7 +62,7 @@ __modpost: vmlinux.symvers
 
 else
 
-MODPOST += -s \
+MODPOST += \
        $(if $(KBUILD_NSDEPS),-d $(MODULES_NSDEPS))
 
 ifeq ($(KBUILD_EXTMOD),)

diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 9301934..b667f53 100644 (file)
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -30,8 +30,6 @@ static int have_vmlinux = 0;
 static int all_versions = 0;
 /* If we are modposting external module set to 1 */
 static int external_module = 0;
-/* Warn about section mismatch in vmlinux if set to 1 */
-static int vmlinux_section_warnings = 1;
 /* Only warn about unresolved symbols */
 static int warn_unresolved = 0;
 /* How a symbol is exported */
@@ -2078,8 +2076,7 @@ static void read_symbols(const char *modname)
                }
        }
 
-       if (!is_vmlinux(modname) || vmlinux_section_warnings)
-               check_sec_ref(mod, modname, &info);
+       check_sec_ref(mod, modname, &info);
 
        if (!is_vmlinux(modname)) {
                version = get_modinfo(&info, "version");
@@ -2576,7 +2573,7 @@ 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, "ei:mnsT:o:awENd:")) != -1) {
+       while ((opt = getopt(argc, argv, "ei:mnT:o:awENd:")) != -1) {
                switch (opt) {
                case 'e':
                        external_module = 1;
@@ -2599,9 +2596,6 @@ int main(int argc, char **argv)
                case 'a':
                        all_versions = 1;
                        break;
-               case 's':
-                       vmlinux_section_warnings = 0;
-                       break;
                case 'T':
                        files_source = optarg;
                        break;