aboutsummaryrefslogtreecommitdiffstats
path: root/scripts/mod/modpost.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2013-02-27 15:25:47 -0500
committerLinus Torvalds <torvalds@linux-foundation.org>2013-02-27 15:25:47 -0500
commit0ca7ffb356063c5ece847687da457dfe748612a2 (patch)
treef7858236ba482814c8cacf45447a3f96548a1688 /scripts/mod/modpost.c
parent30acd906b02470e7eb346401de966a33864d9af4 (diff)
parent423a8155facf23719078ff63911c1e85ba40970b (diff)
Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull kbuild changes from Michal Marek: - Alias generation in modpost is cross-compile safe. - kernel/timeconst.h is now generated using a bc script instead of perl. - scripts/link-vmlinux.sh now works with an alternative $KCONFIG_CONFIG. - destination-y for exported headers is supported in Kbuild files again. - depmod is called with -P $CONFIG_SYMBOL_PREFIX on architectures that need it. - CONFIG_DEBUG_INFO_REDUCED disables var-tracking - scripts/setlocalversion works with too much translated locales ;) * 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild: kbuild: Fix reading of .config in link-vmlinux.sh kbuild: Unset language specific variables in setlocalversion script Kbuild: Disable var tracking with CONFIG_DEBUG_INFO_REDUCED depmod: pass -P $CONFIG_SYMBOL_PREFIX kbuild: Fix destination-y for installed headers scripts/link-vmlinux.sh: source variables from KCONFIG_CONFIG kernel: Replace timeconst.pl with a bc script mod/file2alias: make modalias generation safe for cross compiling
Diffstat (limited to 'scripts/mod/modpost.c')
-rw-r--r--scripts/mod/modpost.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 1c6fbb1a4f8e..78b30c1548e9 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -2128,7 +2128,7 @@ int main(int argc, char **argv)
2128 struct ext_sym_list *extsym_iter; 2128 struct ext_sym_list *extsym_iter;
2129 struct ext_sym_list *extsym_start = NULL; 2129 struct ext_sym_list *extsym_start = NULL;
2130 2130
2131 while ((opt = getopt(argc, argv, "i:I:e:cmsSo:awM:K:")) != -1) { 2131 while ((opt = getopt(argc, argv, "i:I:e:msSo:awM:K:")) != -1) {
2132 switch (opt) { 2132 switch (opt) {
2133 case 'i': 2133 case 'i':
2134 kernel_read = optarg; 2134 kernel_read = optarg;
@@ -2137,9 +2137,6 @@ int main(int argc, char **argv)
2137 module_read = optarg; 2137 module_read = optarg;
2138 external_module = 1; 2138 external_module = 1;
2139 break; 2139 break;
2140 case 'c':
2141 cross_build = 1;
2142 break;
2143 case 'e': 2140 case 'e':
2144 external_module = 1; 2141 external_module = 1;
2145 extsym_iter = 2142 extsym_iter =