12 files changed, 266 insertions, 43 deletions

diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
index b0d067be73..2180c88cfe 100644
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@ -13,6 +13,10 @@ space   := $(empty) $(empty)
 depfile = $(subst $(comma),_,$(@D)/.$(@F).d)
 
 ###
+# filename of target with directory and extension stripped
+basetarget = $(basename $(notdir $@))
+
+###
 # Escape single quote for use in echo statements
 escsq = $(subst $(squote),'\$(squote)',$1)
 
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 02a7eea5fd..3cb445cc74 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -117,7 +117,7 @@ $(real-objs-m:.o=.lst): quiet_modtag := [M]
 $(obj-m)              : quiet_modtag := [M]
 
 # Default for not multi-part modules
-modname = $(*F)
+modname = $(basetarget)
 
 $(multi-objs-m)         : modname = $(modname-multi)
 $(multi-objs-m:.o=.i)   : modname = $(modname-multi)
diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst
new file mode 100644
index 0000000000..aa9990a3cc
--- /dev/null
+++ b/scripts/Makefile.headersinst
@@ -0,0 +1,158 @@
+# ==========================================================================
+# Installing headers
+#
+# header-y files will be installed verbatim
+# unifdef-y are the files where unifdef will be run before installing files
+# objhdr-y are generated files that will be installed verbatim
+#
+# ==========================================================================
+
+UNIFDEF := unifdef -U__KERNEL__
+
+# Eliminate the contents of (and inclusions of) compiler.h
+HDRSED  := sed  -e "s/ inline / __inline__ /g" \
+                -e "s/[[:space:]]__user[[:space:]]\+/ /g" \
+                -e "s/(__user[[:space:]]\+/ (/g" \
+                -e "s/[[:space:]]__force[[:space:]]\+/ /g" \
+                -e "s/(__force[[:space:]]\+/ (/g" \
+                -e "s/[[:space:]]__iomem[[:space:]]\+/ /g" \
+                -e "s/(__iomem[[:space:]]\+/ (/g" \
+                -e "s/[[:space:]]__attribute_const__[[:space:]]\+/\ /g" \
+                -e "s/[[:space:]]__attribute_const__$$//" \
+                -e "/^\#include <linux\/compiler.h>/d"
+
+_dst := $(if $(dst),$(dst),$(obj))
+
+.PHONY: __headersinst
+__headersinst:
+
+
+ifeq (,$(patsubst include/asm/%,,$(obj)/))
+# For producing the generated stuff in include/asm for biarch builds, include
+# both sets of Kbuild files; we'll generate anything which is mentioned in
+# _either_ arch, and recurse into subdirectories which are mentioned in either
+# arch. Since some directories may exist in one but not the other, we must
+# use '-include'.
+GENASM := 1
+archasm    := $(subst include/asm,asm-$(ARCH),$(obj))
+altarchasm := $(subst include/asm,asm-$(ALTARCH),$(obj))
+-include $(srctree)/include/$(archasm)/Kbuild
+-include $(srctree)/include/$(altarchasm)/Kbuild
+else
+include $(srctree)/$(obj)/Kbuild
+endif
+
+include scripts/Kbuild.include
+
+# If this is include/asm-$(ARCH) and there's no $(ALTARCH), then
+# override $(_dst) so that we install to include/asm directly.
+ifeq ($(obj)$(ALTARCH),include/asm-$(ARCH))
+     _dst := include/asm
+endif
+
+header-y        := $(sort $(header-y))
+unifdef-y       := $(sort $(unifdef-y))
+subdir-y        := $(patsubst %/,%,$(filter %/, $(header-y)))
+header-y        := $(filter-out %/, $(header-y))
+header-y        := $(filter-out $(unifdef-y),$(header-y))
+
+ifdef ALTARCH
+ifeq ($(obj),include/asm-$(ARCH))
+altarch-y       := altarch-dir
+endif
+endif
+
+# Make the definitions visible for recursive make invocations
+export ALTARCH
+export ARCHDEF
+export ALTARCHDEF
+
+quiet_cmd_o_hdr_install   = INSTALL $(_dst)/$@
+      cmd_o_hdr_install   = cp $(objtree)/$(obj)/$@ $(INSTALL_HDR_PATH)/$(_dst)
+
+quiet_cmd_headers_install = INSTALL $(_dst)/$@
+      cmd_headers_install = $(HDRSED) $(srctree)/$(obj)/$@              \
+                            > $(INSTALL_HDR_PATH)/$(_dst)/$@
+
+quiet_cmd_unifdef         = UNIFDEF $(_dst)/$@
+      cmd_unifdef         = $(UNIFDEF) $(srctree)/$(obj)/$@ | $(HDRSED) \
+                            > $(INSTALL_HDR_PATH)/$(_dst)/$@ || :
+
+quiet_cmd_check           = CHECK   $(_dst)/$@
+      cmd_check           = $(srctree)/scripts/hdrcheck.sh              \
+                              $(INSTALL_HDR_PATH)/include               \
+                              $(INSTALL_HDR_PATH)/$(_dst)/$@
+
+quiet_cmd_mkdir           = MKDIR   $@
+      cmd_mkdir           = mkdir -p $(INSTALL_HDR_PATH)/$@
+
+quiet_cmd_gen             = GEN     $(_dst)/$@
+      cmd_gen             = \
+STUBDEF=__ASM_STUB_`echo $@ | tr a-z. A-Z_`;                            \
+(echo "/* File autogenerated by 'make headers_install' */" ;            \
+echo "\#ifndef $$STUBDEF" ;                                             \
+echo "\#define $$STUBDEF" ;                                             \
+echo "\# if $(ARCHDEF)" ;                                               \
+if [ -r $(srctree)/include/$(archasm)/$@ ]; then                        \
+        echo "\#  include <$(archasm)/$@>" ;                            \
+else                                                                    \
+        echo "\#  error $(archasm)/$@ does not exist in"                \
+                        "the $(ARCH) architecture" ;                    \
+fi ;                                                                    \
+echo "\# elif $(ALTARCHDEF)" ;                                          \
+if [ -r $(srctree)/include/$(altarchasm)/$@ ]; then                     \
+        echo "\#  include <$(altarchasm)/$@>" ;                         \
+else                                                                    \
+        echo "\#  error $(altarchasm)/$@ does not exist in"             \
+                        "the $(ALTARCH) architecture" ;                 \
+fi ;                                                                    \
+echo "\# else" ;                                                        \
+echo "\#  warning This machine appears to be"                           \
+                 "neither $(ARCH) nor $(ALTARCH)." ;                    \
+echo "\# endif" ;                                                       \
+echo "\#endif /* $$STUBDEF */" ;                                        \
+) > $(INSTALL_HDR_PATH)/$(_dst)/$@
+
+__headersinst: $(subdir-y) $(header-y) $(unifdef-y) $(altarch-y) $(objhdr-y)
+
+.PHONY: $(header-y) $(unifdef-y) $(subdir-y)
+
+ifdef HDRCHECK
+# Rules for checking headers
+$(objhdr-y) $(header-y) $(unifdef-y):
+        $(call cmd,check)
+else
+# Rules for installing headers
+
+$(objhdr-y) $(subdir-y) $(header-y) $(unifdef-y): $(_dst)
+
+.PHONY: $(_dst)
+$(_dst):
+        $(call cmd,mkdir)
+
+ifdef GENASM
+$(objhdr-y) $(header-y) $(unifdef-y):
+        $(call cmd,gen)
+
+else
+$(objhdr-y):
+        $(call cmd,o_hdr_install)
+
+$(header-y):
+        $(call cmd,headers_install)
+
+$(unifdef-y):
+        $(call cmd,unifdef)
+endif
+endif
+
+hdrinst := -rR -f $(srctree)/scripts/Makefile.headersinst obj
+
+.PHONY: altarch-dir
+altarch-dir:
+        $(Q)$(MAKE) $(hdrinst)=include/asm-$(ALTARCH) dst=include/asm-$(ALTARCH)
+        $(Q)$(MAKE) $(hdrinst)=include/asm dst=include/asm
+
+# Recursion
+$(subdir-y):
+        $(Q)$(MAKE) $(hdrinst)=$(obj)/$@ dst=$(_dst)/$@ rel=../$(rel)
diff --git a/scripts/Makefile.host b/scripts/Makefile.host
index 2b066d12af..18ecd4d5df 100644
--- a/scripts/Makefile.host
+++ b/scripts/Makefile.host
@@ -80,8 +80,10 @@ obj-dirs += $(host-objdirs)
 #####
 # Handle options to gcc. Support building with separate output directory
 
-_hostc_flags   = $(HOSTCFLAGS)   $(HOST_EXTRACFLAGS)   $(HOSTCFLAGS_$(*F).o)
-_hostcxx_flags = $(HOSTCXXFLAGS) $(HOST_EXTRACXXFLAGS) $(HOSTCXXFLAGS_$(*F).o)
+_hostc_flags   = $(HOSTCFLAGS)   $(HOST_EXTRACFLAGS)   \
+                 $(HOSTCFLAGS_$(basetarget).o)
+_hostcxx_flags = $(HOSTCXXFLAGS) $(HOST_EXTRACXXFLAGS) \
+                 $(HOSTCXXFLAGS_$(basetarget).o)
 
 ifeq ($(KBUILD_SRC),)
 __hostc_flags   = $(_hostc_flags)
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index 2cb4935e85..fc498fee68 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -82,12 +82,12 @@ obj-dirs	:= $(addprefix $(obj)/,$(obj-dirs))
 #       than one module. In that case KBUILD_MODNAME will be set to foo_bar,
 #       where foo and bar are the name of the modules.
 name-fix = $(subst $(comma),_,$(subst -,_,$1))
-basename_flags = -D"KBUILD_BASENAME=KBUILD_STR($(call name-fix,$(*F)))"
+basename_flags = -D"KBUILD_BASENAME=KBUILD_STR($(call name-fix,$(basetarget)))"
 modname_flags  = $(if $(filter 1,$(words $(modname))),\
                  -D"KBUILD_MODNAME=KBUILD_STR($(call name-fix,$(modname)))")
 
-_c_flags       = $(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$(*F).o)
-_a_flags       = $(AFLAGS) $(EXTRA_AFLAGS) $(AFLAGS_$(*F).o)
+_c_flags       = $(CFLAGS) $(EXTRA_CFLAGS) $(CFLAGS_$(basetarget).o)
+_a_flags       = $(AFLAGS) $(EXTRA_AFLAGS) $(AFLAGS_$(basetarget).o)
 _cpp_flags     = $(CPPFLAGS) $(EXTRA_CPPFLAGS) $(CPPFLAGS_$(@F))
 
 # If building the kernel in a separate objtree expand all occurrences
diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
index 576cce5e38..a49550205d 100644
--- a/scripts/Makefile.modpost
+++ b/scripts/Makefile.modpost
@@ -72,7 +72,7 @@ $(modules:.ko=.mod.c): __modpost ;
 # Step 5), compile all *.mod.c files
 
 # modname is set to make c_flags define KBUILD_MODNAME
-modname = $(*F)
+modname = $(notdir $(@:.mod.o=))
 
 quiet_cmd_cc_o_c = CC      $@
       cmd_cc_o_c = $(CC) $(c_flags) $(CFLAGS_MODULE)    \
diff --git a/scripts/checkversion.pl b/scripts/checkversion.pl
index 9f84e56231..ec7d21161b 100755
--- a/scripts/checkversion.pl
+++ b/scripts/checkversion.pl
@@ -1,7 +1,7 @@
 #! /usr/bin/perl
 #
-# checkversion find uses of LINUX_VERSION_CODE, KERNEL_VERSION, or
-# UTS_RELEASE without including <linux/version.h>, or cases of
+# checkversion find uses of LINUX_VERSION_CODE or KERNEL_VERSION
+# without including <linux/version.h>, or cases of
 # including <linux/version.h> that don't need it.
 # Copyright (C) 2003, Randy Dunlap <rdunlap@xenotime.net>
 
@@ -41,8 +41,7 @@ foreach $file (@ARGV)
         }
 
         # Look for uses: LINUX_VERSION_CODE, KERNEL_VERSION, UTS_RELEASE
-        if (($_ =~ /LINUX_VERSION_CODE/) || ($_ =~ /\WKERNEL_VERSION/) ||
-                ($_ =~ /UTS_RELEASE/)) {
+        if (($_ =~ /LINUX_VERSION_CODE/) || ($_ =~ /\WKERNEL_VERSION/)) {
             $fUseVersion = 1;
             last LINE if $iLinuxVersion;
         }
diff --git a/scripts/hdrcheck.sh b/scripts/hdrcheck.sh
new file mode 100755
index 0000000000..b3bb683b56
--- /dev/null
+++ b/scripts/hdrcheck.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+for FILE in `grep '^#include <' $2 | cut -f2 -d\< | cut -f1 -d\> | egrep ^linux\|^asm` ; do
+    if [ ! -r $1/$FILE ]; then
+        echo $2 requires $FILE, which does not exist
+        exit 1
+    fi
+done
diff --git a/scripts/kconfig/lxdialog/checklist.c b/scripts/kconfig/lxdialog/checklist.c
index be0200e9cd..79886413b6 100644
--- a/scripts/kconfig/lxdialog/checklist.c
+++ b/scripts/kconfig/lxdialog/checklist.c
@@ -187,9 +187,12 @@ int dialog_checklist(const char *title, const char *prompt, int height,
 
         /* Print the list */
         for (i = 0; i < max_choice; i++) {
-                print_item(list, items[(scroll + i) * 3 + 1],
-                           status[i + scroll], i, i == choice);
+                if (i != choice)
+                        print_item(list, items[(scroll + i) * 3 + 1],
+                                   status[i + scroll], i, 0);
         }
+        print_item(list, items[(scroll + choice) * 3 + 1],
+                   status[choice + scroll], choice, 1);
 
         print_arrows(dialog, choice, item_no, scroll,
                      box_y, box_x + check_x + 5, list_height);
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index 00e21297ae..f9460a6218 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -1056,7 +1056,8 @@ sub output_struct_man(%) {
             # pointer-to-function
             print ".BI \"    ".$1."\" ".$parameter." \") (".$2.")"."\"\n;\n";
         } elsif ($type =~ m/^(.*?)\s*(:.*)/) {
-            print ".BI \"    ".$1."\" ".$parameter.$2." \""."\"\n;\n";
+            # bitfield
+            print ".BI \"    ".$1."\ \" ".$parameter.$2." \""."\"\n;\n";
         } else {
             $type =~ s/([^\*])$/$1 /;
             print ".BI \"    ".$type."\" ".$parameter." \""."\"\n;\n";
@@ -1118,7 +1119,10 @@ sub output_function_text(%) {
     my %args = %{$_[0]};
     my ($parameter, $section);
 
-    print "Function:\n\n";
+    print "Name:\n\n";
+    print $args{'function'}." - ".$args{'purpose'}."\n";
+
+    print "\nSynopsis:\n\n";
     my $start=$args{'functiontype'}." ".$args{'function'}." (";
     print $start;
     my $count = 0;
@@ -1169,6 +1173,7 @@ sub output_enum_text(%) {
     my $count;
     print "Enum:\n\n";
 
+    print "enum ".$args{'enum'}." - ".$args{'purpose'}."\n\n";
     print "enum ".$args{'enum'}." {\n";
     $count = 0;
     foreach $parameter (@{$args{'parameterlist'}}) {
@@ -1197,7 +1202,7 @@ sub output_typedef_text(%) {
     my $count;
     print "Typedef:\n\n";
 
-    print "typedef ".$args{'typedef'}."\n";
+    print "typedef ".$args{'typedef'}." - ".$args{'purpose'}."\n";
     output_section_text(@_);
 }
 
@@ -1206,7 +1211,7 @@ sub output_struct_text(%) {
     my %args = %{$_[0]};
     my ($parameter);
 
-    print $args{'type'}." ".$args{'struct'}.":\n\n";
+    print $args{'type'}." ".$args{'struct'}." - ".$args{'purpose'}."\n\n";
     print $args{'type'}." ".$args{'struct'}." {\n";
     foreach $parameter (@{$args{'parameterlist'}}) {
         if ($parameter =~ /^#/) {
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 0dd1617764..dfde0e87a7 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -24,7 +24,10 @@ static int all_versions = 0;
 /* If we are modposting external module set to 1 */
 static int external_module = 0;
 /* How a symbol is exported */
-enum export {export_plain, export_gpl, export_gpl_future, export_unknown};
+enum export {
+        export_plain,      export_unused,     export_gpl,
+        export_unused_gpl, export_gpl_future, export_unknown
+};
 
 void fatal(const char *fmt, ...)
 {
@@ -191,7 +194,9 @@ static struct {
         enum export export;
 } export_list[] = {
         { .str = "EXPORT_SYMBOL",            .export = export_plain },
+        { .str = "EXPORT_UNUSED_SYMBOL",     .export = export_unused },
         { .str = "EXPORT_SYMBOL_GPL",        .export = export_gpl },
+        { .str = "EXPORT_UNUSED_SYMBOL_GPL", .export = export_unused_gpl },
         { .str = "EXPORT_SYMBOL_GPL_FUTURE", .export = export_gpl_future },
         { .str = "(unknown)",                .export = export_unknown },
 };
@@ -205,6 +210,8 @@ static const char *export_str(enum export ex)
 static enum export export_no(const char * s)
 {
         int i;
+        if (!s)
+                return export_unknown;
         for (i = 0; export_list[i].export != export_unknown; i++) {
                 if (strcmp(export_list[i].str, s) == 0)
                         return export_list[i].export;
@@ -216,8 +223,12 @@ static enum export export_from_sec(struct elf_info *elf, Elf_Section sec)
 {
         if (sec == elf->export_sec)
                 return export_plain;
+        else if (sec == elf->export_unused_sec)
+                return export_unused;
         else if (sec == elf->export_gpl_sec)
                 return export_gpl;
+        else if (sec == elf->export_unused_gpl_sec)
+                return export_unused_gpl;
         else if (sec == elf->export_gpl_future_sec)
                 return export_gpl_future;
         else
@@ -366,8 +377,12 @@ static void parse_elf(struct elf_info *info, const char *filename)
                         info->modinfo_len = sechdrs[i].sh_size;
                 } else if (strcmp(secname, "__ksymtab") == 0)
                         info->export_sec = i;
+                else if (strcmp(secname, "__ksymtab_unused") == 0)
+                        info->export_unused_sec = i;
                 else if (strcmp(secname, "__ksymtab_gpl") == 0)
                         info->export_gpl_sec = i;
+                else if (strcmp(secname, "__ksymtab_unused_gpl") == 0)
+                        info->export_unused_gpl_sec = i;
                 else if (strcmp(secname, "__ksymtab_gpl_future") == 0)
                         info->export_gpl_future_sec = i;
 
@@ -1085,38 +1100,64 @@ void buf_write(struct buffer *buf, const char *s, int len)
         buf->pos += len;
 }
 
-void check_license(struct module *mod)
+static void check_for_gpl_usage(enum export exp, const char *m, const char *s)
+{
+        const char *e = is_vmlinux(m) ?"":".ko";
+
+        switch (exp) {
+        case export_gpl:
+                fatal("modpost: GPL-incompatible module %s%s "
+                      "uses GPL-only symbol '%s'\n", m, e, s);
+                break;
+        case export_unused_gpl:
+                fatal("modpost: GPL-incompatible module %s%s "
+                      "uses GPL-only symbol marked UNUSED '%s'\n", m, e, s);
+                break;
+        case export_gpl_future:
+                warn("modpost: GPL-incompatible module %s%s "
+                      "uses future GPL-only symbol '%s'\n", m, e, s);
+                break;
+        case export_plain:
+        case export_unused:
+        case export_unknown:
+                /* ignore */
+                break;
+        }
+}
+
+static void check_for_unused(enum export exp, const char* m, const char* s)
+{
+        const char *e = is_vmlinux(m) ?"":".ko";
+
+        switch (exp) {
+        case export_unused:
+        case export_unused_gpl:
+                warn("modpost: module %s%s "
+                      "uses symbol '%s' marked UNUSED\n", m, e, s);
+                break;
+        default:
+                /* ignore */
+                break;
+        }
+}
+
+static void check_exports(struct module *mod)
 {
         struct symbol *s, *exp;
 
         for (s = mod->unres; s; s = s->next) {
                 const char *basename;
-                if (mod->gpl_compatible == 1) {
-                        /* GPL-compatible modules may use all symbols */
-                        continue;
-                }
                 exp = find_symbol(s->name);
                 if (!exp || exp->module == mod)
                         continue;
                 basename = strrchr(mod->name, '/');
                 if (basename)
                         basename++;
-                switch (exp->export) {
-                        case export_gpl:
-                                fatal("modpost: GPL-incompatible module %s "
-                                      "uses GPL-only symbol '%s'\n",
-                                 basename ? basename : mod->name,
-                                exp->name);
-                                break;
-                        case export_gpl_future:
-                                warn("modpost: GPL-incompatible module %s "
-                                      "uses future GPL-only symbol '%s'\n",
-                                      basename ? basename : mod->name,
-                                      exp->name);
-                                break;
-                        case export_plain: /* ignore */ break;
-                        case export_unknown: /* ignore */ break;
-                }
+                else
+                        basename = mod->name;
+                if (!mod->gpl_compatible)
+                        check_for_gpl_usage(exp->export, basename, exp->name);
+                check_for_unused(exp->export, basename, exp->name);
         }
 }
 
@@ -1271,7 +1312,7 @@ static void write_if_changed(struct buffer *b, const char *fname)
 }
 
 /* parse Module.symvers file. line format:
- * 0x12345678<tab>symbol<tab>module[<tab>export]
+ * 0x12345678<tab>symbol<tab>module[[<tab>export]<tab>something]
  **/
 static void read_dump(const char *fname, unsigned int kernel)
 {
@@ -1284,7 +1325,7 @@ static void read_dump(const char *fname, unsigned int kernel)
                 return;
 
         while ((line = get_next_line(&pos, file, size))) {
-                char *symname, *modname, *d, *export;
+                char *symname, *modname, *d, *export, *end;
                 unsigned int crc;
                 struct module *mod;
                 struct symbol *s;
@@ -1297,7 +1338,8 @@ static void read_dump(const char *fname, unsigned int kernel)
                 *modname++ = '\0';
                 if ((export = strchr(modname, '\t')) != NULL)
                         *export++ = '\0';
-
+                if (export && ((end = strchr(export, '\t')) != NULL))
+                        *end = '\0';
                 crc = strtoul(line, &d, 16);
                 if (*symname == '\0' || *modname == '\0' || *d != '\0')
                         goto fail;
@@ -1396,7 +1438,7 @@ int main(int argc, char **argv)
         for (mod = modules; mod; mod = mod->next) {
                 if (mod->skip)
                         continue;
-                check_license(mod);
+                check_exports(mod);
         }
 
         for (mod = modules; mod; mod = mod->next) {
diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h
index 2b00c60628..d398c61e55 100644
--- a/scripts/mod/modpost.h
+++ b/scripts/mod/modpost.h
@@ -117,7 +117,9 @@ struct elf_info {
         Elf_Sym      *symtab_start;
         Elf_Sym      *symtab_stop;
         Elf_Section  export_sec;
+        Elf_Section  export_unused_sec;
         Elf_Section  export_gpl_sec;
+        Elf_Section  export_unused_gpl_sec;
         Elf_Section  export_gpl_future_sec;
         const char   *strtab;
         char         *modinfo;