Merge commit '31d9adca82ce65e5c99d045b5fd917c702b6fce3' into tmp

Conflicts:
	arch/arm/plat-omap/dmtimer.c

1 files changed, 3 insertions, 4 deletions

diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index ff36c508a10e..78b30c1548e9 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -830,6 +830,8 @@ static const char *section_white_list[] =
         ".toc*",
         ".xt.prop",                              /* xtensa */
         ".xt.lit",         /* xtensa */
+        ".arcextmap*",                  /* arc */
+        ".gnu.linkonce.arcext*",        /* arc : modules */
         NULL
 };
 
@@ -2126,7 +2128,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:cmsSo:awM:K:")) != -1) {
+        while ((opt = getopt(argc, argv, "i:I:e:msSo:awM:K:")) != -1) {
                 switch (opt) {
                 case 'i':
                         kernel_read = optarg;
@@ -2135,9 +2137,6 @@ int main(int argc, char **argv)
                         module_read = optarg;
                         external_module = 1;
                         break;
-                case 'c':
-                        cross_build = 1;
-                        break;
                 case 'e':
                         external_module = 1;
                         extsym_iter =