2 files changed, 18 insertions, 7 deletions

diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
index 69f0a1417e9a..1366a94b6c39 100644
--- a/scripts/Makefile.modpost
+++ b/scripts/Makefile.modpost
@@ -77,6 +77,7 @@ modpost = scripts/mod/modpost                    \
  $(if $(KBUILD_EXTRA_SYMBOLS), $(patsubst %, -e %,$(KBUILD_EXTRA_SYMBOLS))) \
  $(if $(KBUILD_EXTMOD),-o $(modulesymfile))      \
  $(if $(CONFIG_DEBUG_SECTION_MISMATCH),,-S)      \
+ $(if $(CONFIG_SECTION_MISMATCH_WARN_ONLY),,-E)  \
  $(if $(KBUILD_EXTMOD)$(KBUILD_MODPOST_WARN),-w)
 
 MODPOST_OPT=$(subst -i,-n,$(filter -i,$(MAKEFLAGS)))
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index d583c98fde31..b2ae8afc1ab1 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -38,6 +38,7 @@ static int warn_unresolved = 0;
 /* How a symbol is exported */
 static int sec_mismatch_count = 0;
 static int sec_mismatch_verbose = 1;
+static int sec_mismatch_fatal = 0;
 /* ignore missing files */
 static int ignore_missing_files;
 
@@ -2385,7 +2386,7 @@ int main(int argc, char **argv)
         struct ext_sym_list *extsym_iter;
         struct ext_sym_list *extsym_start = NULL;
 
-        while ((opt = getopt(argc, argv, "i:I:e:mnsST:o:awM:K:")) != -1) {
+        while ((opt = getopt(argc, argv, "i:I:e:mnsST:o:awM:K:E")) != -1) {
                 switch (opt) {
                 case 'i':
                         kernel_read = optarg;
@@ -2426,6 +2427,9 @@ int main(int argc, char **argv)
                 case 'w':
                         warn_unresolved = 1;
                         break;
+                case 'E':
+                        sec_mismatch_fatal = 1;
+                        break;
                 default:
                         exit(1);
                 }
@@ -2475,14 +2479,20 @@ int main(int argc, char **argv)
                 sprintf(fname, "%s.mod.c", mod->name);
                 write_if_changed(&buf, fname);
         }
-
         if (dump_write)
                 write_dump(dump_write);
-        if (sec_mismatch_count && !sec_mismatch_verbose)
-                warn("modpost: Found %d section mismatch(es).\n"
-                     "To see full details build your kernel with:\n"
-                     "'make CONFIG_DEBUG_SECTION_MISMATCH=y'\n",
-                     sec_mismatch_count);
+        if (sec_mismatch_count) {
+                if (!sec_mismatch_verbose) {
+                        warn("modpost: Found %d section mismatch(es).\n"
+                             "To see full details build your kernel with:\n"
+                             "'make CONFIG_DEBUG_SECTION_MISMATCH=y'\n",
+                             sec_mismatch_count);
+                }
+                if (sec_mismatch_fatal) {
+                        fatal("modpost: Section mismatches detected.\n"
+                              "Set CONFIG_SECTION_MISMATCH_WARN_ONLY=y to allow them.\n");
+                }
+        }
 
         return err;
 }