Merge branch 'master' of /pub/scm/linux/kernel/git/torvalds/linux-2.6

7 files changed, 53 insertions, 13 deletions

diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 67fb4530a6ff..277cfe0b7100 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -27,12 +27,12 @@ ccflags-y  :=
 cppflags-y :=
 ldflags-y  :=
 
-# Read .config if it exist, otherwise ignore
+# Read auto.conf if it exists, otherwise ignore
 -include include/config/auto.conf
 
 include scripts/Kbuild.include
 
-# For backward compatibility check that these variables does not change
+# For backward compatibility check that these variables do not change
 save-cflags := $(CFLAGS)
 
 # The filename Kbuild has precedence over Makefile
@@ -55,7 +55,7 @@ hostprogs-y += $(host-progs)
 endif
 endif
 
-# Do not include host rules unles needed
+# Do not include host rules unless needed
 ifneq ($(hostprogs-y)$(hostprogs-m),)
 include scripts/Makefile.host
 endif
diff --git a/scripts/Makefile.clean b/scripts/Makefile.clean
index 2c647107c9cc..6f89fbb56256 100644
--- a/scripts/Makefile.clean
+++ b/scripts/Makefile.clean
@@ -37,7 +37,7 @@ subdir-ymn      := $(sort $(subdir-ym) $(subdir-n) $(subdir-))
 
 subdir-ymn      := $(addprefix $(obj)/,$(subdir-ymn))
 
-# build a list of files to remove, usually releative to the current
+# build a list of files to remove, usually relative to the current
 # directory
 
 __clean-files   := $(extra-y) $(always)                  \
diff --git a/scripts/Makefile.host b/scripts/Makefile.host
index 6943a7a5bb98..1ac414fd5030 100644
--- a/scripts/Makefile.host
+++ b/scripts/Makefile.host
@@ -3,9 +3,9 @@
 # Binaries are used during the compilation of the kernel, for example
 # to preprocess a data file.
 #
-# Both C and C++ is supported, but preferred language is C for such utilities.
+# Both C and C++ are supported, but preferred language is C for such utilities.
 #
-# Samle syntax (see Documentation/kbuild/makefile.txt for reference)
+# Sample syntax (see Documentation/kbuild/makefiles.txt for reference)
 # hostprogs-y := bin2hex
 # Will compile bin2hex.c and create an executable named bin2hex
 #
@@ -23,10 +23,10 @@
 # hostprogs-y := conf
 # conf-objs  := conf.o libkconfig.so
 # libkconfig-objs := expr.o type.o
-# Will create a shared library named libkconfig.so that consist of
-# expr.o and type.o (they are both compiled as C code and the object file
+# Will create a shared library named libkconfig.so that consists of
+# expr.o and type.o (they are both compiled as C code and the object files
 # are made as position independent code).
-# conf.c is compiled as a c program, and conf.o is linked together with
+# conf.c is compiled as a C program, and conf.o is linked together with
 # libkconfig.so as the executable conf.
 # Note: Shared libraries consisting of C++ files are not supported
 
@@ -61,7 +61,7 @@ host-cobjs	:= $(filter-out %.so,$(host-cobjs))
 host-cshobjs    := $(sort $(foreach m,$(host-cshlib),$($(m:.so=-objs))))
 
 # output directory for programs/.o files
-# hostprogs-y := tools/build may have been specified. Retreive directory
+# hostprogs-y := tools/build may have been specified. Retrieve directory
 host-objdirs := $(foreach f,$(__hostprogs), $(if $(dir $(f)),$(dir $(f))))
 # directory of .o files from prog-objs notation
 host-objdirs += $(foreach f,$(host-cmulti),                  \
diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
index 2d20640854b7..24b3c8fe6bca 100644
--- a/scripts/Makefile.modpost
+++ b/scripts/Makefile.modpost
@@ -42,6 +42,13 @@ _modpost: __modpost
 
 include include/config/auto.conf
 include scripts/Kbuild.include
+
+ifneq ($(KBUILD_EXTMOD),)
+# Include the module's Makefile to find KBUILD_EXTRA_SYMBOLS
+include $(if $(wildcard $(KBUILD_EXTMOD)/Kbuild), \
+             $(KBUILD_EXTMOD)/Kbuild, $(KBUILD_EXTMOD)/Makefile)
+endif
+
 include scripts/Makefile.lib
 
 kernelsymfile := $(objtree)/Module.symvers
@@ -69,6 +76,7 @@ modpost = scripts/mod/modpost                    \
  $(if $(CONFIG_MODULE_SRCVERSION_ALL),-a,)       \
  $(if $(KBUILD_EXTMOD),-i,-o) $(kernelsymfile)   \
  $(if $(KBUILD_EXTMOD),-I $(modulesymfile))      \
+ $(if $(iKBUILD_EXTRA_SYMBOLS), $(patsubst %, -e %,$(EXTRA_SYMBOLS))) \
  $(if $(KBUILD_EXTMOD),-o $(modulesymfile))      \
  $(if $(CONFIG_DEBUG_SECTION_MISMATCH),,-S)      \
  $(if $(CONFIG_MARKERS),-K $(kernelmarkersfile)) \
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index 58a94947d655..64ec4b8a51b5 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -1889,6 +1889,13 @@ sub process {
                                 WARN("kfree(NULL) is safe this check is probabally not required\n" . $hereprev);
                         }
                 }
+# check for needless usb_free_urb() checks
+                if ($prevline =~ /\bif\s*\(([^\)]*)\)/) {
+                        my $expr = $1;
+                        if ($line =~ /\busb_free_urb\(\Q$expr\E\);/) {
+                                WARN("usb_free_urb(NULL) is safe this check is probabally not required\n" . $hereprev);
+                        }
+                }
 
 # warn about #ifdefs in C files
 #               if ($line =~ /^.#\s*if(|n)def/ && ($realfile =~ /\.c$/)) {
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 32e8c5a227c3..fa1a7d565903 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -36,10 +36,10 @@ update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h
             --output $(obj)/config.pot
         $(Q)sed -i s/CHARSET/UTF-8/ $(obj)/config.pot
         $(Q)ln -fs Kconfig.i386 arch/um/Kconfig.arch
-        $(Q)(for i in `ls arch/`;                        \
+        $(Q)(for i in `ls arch/*/Kconfig`;               \
             do                                           \
                 echo "  GEN $$i";                        \
-                $(obj)/kxgettext arch/$$i/Kconfig        \
+                $(obj)/kxgettext $$i                     \
                      >> $(obj)/config.pot;               \
             done )
         $(Q)msguniq --sort-by-file --to-code=UTF-8 $(obj)/config.pot \
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 110cf243fa4e..f8b42ab0724b 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -1552,6 +1552,10 @@ static void read_symbols(char *modname)
         }
 
         license = get_modinfo(info.modinfo, info.modinfo_len, "license");
+        if (!license && !is_vmlinux(modname))
+                fatal("modpost: missing MODULE_LICENSE() in %s\n"
+                      "see include/linux/module.h for "
+                      "more information\n", modname);
         while (license) {
                 if (license_is_gpl_compatible(license))
                         mod->gpl_compatible = 1;
@@ -2015,6 +2019,11 @@ static void write_markers(const char *fname)
         write_if_changed(&buf, fname);
 }
 
+struct ext_sym_list {
+        struct ext_sym_list *next;
+        const char *file;
+};
+
 int main(int argc, char **argv)
 {
         struct module *mod;
@@ -2025,8 +2034,10 @@ int main(int argc, char **argv)
         char *markers_write = NULL;
         int opt;
         int err;
+        struct ext_sym_list *extsym_iter;
+        struct ext_sym_list *extsym_start = NULL;
 
-        while ((opt = getopt(argc, argv, "i:I:cmsSo:awM:K:")) != -1) {
+        while ((opt = getopt(argc, argv, "i:I:e:cmsSo:awM:K:")) != -1) {
                 switch (opt) {
                 case 'i':
                         kernel_read = optarg;
@@ -2038,6 +2049,14 @@ int main(int argc, char **argv)
                 case 'c':
                         cross_build = 1;
                         break;
+                case 'e':
+                        external_module = 1;
+                        extsym_iter =
+                           NOFAIL(malloc(sizeof(*extsym_iter)));
+                        extsym_iter->next = extsym_start;
+                        extsym_iter->file = optarg;
+                        extsym_start = extsym_iter;
+                        break;
                 case 'm':
                         modversions = 1;
                         break;
@@ -2071,6 +2090,12 @@ int main(int argc, char **argv)
                 read_dump(kernel_read, 1);
         if (module_read)
                 read_dump(module_read, 0);
+        while (extsym_start) {
+                read_dump(extsym_start->file, 0);
+                extsym_iter = extsym_start->next;
+                free(extsym_start);
+                extsym_start = extsym_iter;
+        }
 
         while (optind < argc)
                 read_symbols(argv[optind++]);