Merge branch 'next' into for-linus

24 files changed, 942 insertions, 588 deletions

diff --git a/scripts/Kbuild.include b/scripts/Kbuild.include
index c67e73ecd5be..ed2773edfe71 100644
--- a/scripts/Kbuild.include
+++ b/scripts/Kbuild.include
@@ -149,6 +149,12 @@ ld-option = $(call try-run,\
 # $(Q)$(MAKE) $(build)=dir
 build := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.build obj
 
+###
+# Shorthand for $(Q)$(MAKE) -f scripts/Makefile.modbuiltin obj=
+# Usage:
+# $(Q)$(MAKE) $(modbuiltin)=dir
+modbuiltin := -f $(if $(KBUILD_SRC),$(srctree)/)scripts/Makefile.modbuiltin obj
+
 # Prefix -I with $(srctree) if it is not an absolute path.
 # skip if -I has no parameter
 addtree = $(if $(patsubst -I%,%,$(1)), \
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 341b58902ffc..0b94d2fa3a88 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -207,6 +207,7 @@ endif
 
 ifdef CONFIG_FTRACE_MCOUNT_RECORD
 cmd_record_mcount = set -e ; perl $(srctree)/scripts/recordmcount.pl "$(ARCH)" \
+        "$(if $(CONFIG_CPU_BIG_ENDIAN),big,little)" \
         "$(if $(CONFIG_64BIT),64,32)" \
         "$(OBJDUMP)" "$(OBJCOPY)" "$(CC)" "$(LD)" "$(NM)" "$(RM)" "$(MV)" \
         "$(if $(part-of-module),1,0)" "$(@)";
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index ffdafb26f539..f9bdf264473d 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -127,6 +127,11 @@ _c_flags += $(if $(patsubst n%,, \
                 $(CFLAGS_GCOV))
 endif
 
+ifdef CONFIG_SYMBOL_PREFIX
+_cpp_flags += -DSYMBOL_PREFIX=$(patsubst "%",%,$(CONFIG_SYMBOL_PREFIX))
+endif
+
+
 # If building the kernel in a separate objtree expand all occurrences
 # of -Idir to -I$(srctree)/dir except for absolute paths (starting with '/').
 
@@ -208,14 +213,19 @@ cmd_gzip = (cat $(filter-out FORCE,$^) | gzip -f -9 > $@) || \
 
 # Bzip2 and LZMA do not include size in file... so we have to fake that;
 # append the size as a 32-bit littleendian number as gzip does.
-size_append = /bin/echo -ne $(shell                                     \
+size_append = printf $(shell                                            \
 dec_size=0;                                                             \
 for F in $1; do                                                         \
         fsize=$$(stat -c "%s" $$F);                                     \
         dec_size=$$(expr $$dec_size + $$fsize);                         \
 done;                                                                   \
-printf "%08x" $$dec_size |                                              \
-        sed 's/\(..\)\(..\)\(..\)\(..\)/\\\\x\4\\\\x\3\\\\x\2\\\\x\1/g' \
+printf "%08x\n" $$dec_size |                                            \
+        sed 's/\(..\)/\1 /g' | {                                        \
+                read ch0 ch1 ch2 ch3;                                   \
+                for ch in $$ch3 $$ch2 $$ch1 $$ch0; do                   \
+                        printf '%s%03o' '\\' $$((0x$$ch));              \
+                done;                                                   \
+        }                                                               \
 )
 
 quiet_cmd_bzip2 = BZIP2   $@
@@ -230,3 +240,8 @@ quiet_cmd_lzma = LZMA    $@
 cmd_lzma = (cat $(filter-out FORCE,$^) | \
         lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
         (rm -f $@ ; false)
+
+quiet_cmd_lzo = LZO    $@
+cmd_lzo = (cat $(filter-out FORCE,$^) | \
+        lzop -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
+        (rm -f $@ ; false)
diff --git a/scripts/Makefile.modbuiltin b/scripts/Makefile.modbuiltin
new file mode 100644
index 000000000000..102a276f6eea
--- /dev/null
+++ b/scripts/Makefile.modbuiltin
@@ -0,0 +1,55 @@
+# ==========================================================================
+# Generating modules.builtin
+# ==========================================================================
+
+src := $(obj)
+
+PHONY := __modbuiltin
+__modbuiltin:
+
+-include include/config/auto.conf
+# tristate.conf sets tristate variables to uppercase 'Y' or 'M'
+# That way, we get the list of built-in modules in obj-Y
+-include include/config/tristate.conf
+
+include scripts/Kbuild.include
+
+# The filename Kbuild has precedence over Makefile
+kbuild-dir := $(if $(filter /%,$(src)),$(src),$(srctree)/$(src))
+kbuild-file := $(if $(wildcard $(kbuild-dir)/Kbuild),$(kbuild-dir)/Kbuild,$(kbuild-dir)/Makefile)
+include $(kbuild-file)
+
+include scripts/Makefile.lib
+__subdir-Y     := $(patsubst %/,%,$(filter %/, $(obj-Y)))
+subdir-Y       += $(__subdir-Y)
+subdir-ym      := $(sort $(subdir-y) $(subdir-Y) $(subdir-m))
+subdir-ym      := $(addprefix $(obj)/,$(subdir-ym))
+obj-Y          := $(addprefix $(obj)/,$(obj-Y))
+
+modbuiltin-subdirs := $(patsubst %,%/modules.builtin, $(subdir-ym))
+modbuiltin-mods    := $(filter %.ko, $(obj-Y:.o=.ko))
+modbuiltin-target  := $(obj)/modules.builtin
+
+__modbuiltin: $(modbuiltin-target) $(subdir-ym)
+        @:
+
+$(modbuiltin-target): $(subdir-ym) FORCE
+        $(Q)(for m in $(modbuiltin-mods); do echo kernel/$$m; done;     \
+        cat /dev/null $(modbuiltin-subdirs)) > $@
+
+PHONY += FORCE
+
+FORCE:
+
+# Descending
+# ---------------------------------------------------------------------------
+
+PHONY += $(subdir-ym)
+$(subdir-ym):
+        $(Q)$(MAKE) $(modbuiltin)=$@
+
+
+# Declare the contents of the .PHONY variable as phony.  We keep that
+# information in a variable se we can use it in if_changed and friends.
+
+.PHONY: $(PHONY)
diff --git a/scripts/basic/fixdep.c b/scripts/basic/fixdep.c
index 6bf21f83837d..ea26b23de082 100644
--- a/scripts/basic/fixdep.c
+++ b/scripts/basic/fixdep.c
@@ -16,15 +16,15 @@
  * tells make when to remake a file.
  *
  * To use this list as-is however has the drawback that virtually
- * every file in the kernel includes <linux/autoconf.h>.
+ * every file in the kernel includes autoconf.h.
  *
- * If the user re-runs make *config, linux/autoconf.h will be
+ * If the user re-runs make *config, autoconf.h will be
  * regenerated.  make notices that and will rebuild every file which
  * includes autoconf.h, i.e. basically all files. This is extremely
  * annoying if the user just changed CONFIG_HIS_DRIVER from n to m.
  *
  * So we play the same trick that "mkdep" played before. We replace
- * the dependency on linux/autoconf.h by a dependency on every config
+ * the dependency on autoconf.h by a dependency on every config
  * option which is mentioned in any of the listed prequisites.
  *
  * kconfig populates a tree in include/config/ with an empty file
@@ -73,7 +73,7 @@
  *   cmd_<target> = <cmdline>
  *
  * and then basically copies the .<target>.d file to stdout, in the
- * process filtering out the dependency on linux/autoconf.h and adding
+ * process filtering out the dependency on autoconf.h and adding
  * dependencies on include/config/my/option.h for every
  * CONFIG_MY_OPTION encountered in any of the prequisites.
  *
@@ -324,7 +324,7 @@ static void parse_dep_file(void *map, size_t len)
                         p++;
                 }
                 memcpy(s, m, p-m); s[p-m] = 0;
-                if (strrcmp(s, "include/linux/autoconf.h") &&
+                if (strrcmp(s, "include/generated/autoconf.h") &&
                     strrcmp(s, "arch/um/include/uml-config.h") &&
                     strrcmp(s, ".ver")) {
                         printf("  %s \\\n", s);
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index bc4114f1ab30..3257d3d96767 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# (c) 2001, Dave Jones. <davej@redhat.com> (the file handling bit)
+# (c) 2001, Dave Jones. (the file handling bit)
 # (c) 2005, Joel Schopp <jschopp@austin.ibm.com> (the ugly bit)
 # (c) 2007,2008, Andy Whitcroft <apw@uk.ibm.com> (new conditions, test suite)
 # (c) 2008,2009, Andy Whitcroft <apw@canonical.com>
diff --git a/scripts/genksyms/keywords.c_shipped b/scripts/genksyms/keywords.c_shipped
index 287467a2e8c7..8060e06798b3 100644
--- a/scripts/genksyms/keywords.c_shipped
+++ b/scripts/genksyms/keywords.c_shipped
@@ -1,4 +1,4 @@
-/* ANSI-C code produced by gperf version 3.0.3 */
+/* ANSI-C code produced by gperf version 3.0.4 */
 /* Command-line: gperf -L ANSI-C -a -C -E -g -H is_reserved_hash -k '1,3,$' -N is_reserved_word -p -t scripts/genksyms/keywords.gperf  */
 
 #if !((' ' == 32) && ('!' == 33) && ('"' == 34) && ('#' == 35) \
@@ -34,7 +34,7 @@ struct resword;
 static const struct resword *is_reserved_word(register const char *str, register unsigned int len);
 #line 5 "scripts/genksyms/keywords.gperf"
 struct resword { const char *name; int token; };
-/* maximum key range = 62, duplicates = 0 */
+/* maximum key range = 64, duplicates = 0 */
 
 #ifdef __GNUC__
 __inline
@@ -48,39 +48,39 @@ is_reserved_hash (register const char *str, register unsigned int len)
 {
   static const unsigned char asso_values[] =
     {
-      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
-      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
-      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
-      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
-      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
-      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
-      65, 65, 65, 65, 65, 65, 65, 65, 65,  5,
-      65, 65, 65, 65, 65, 65, 35, 65, 65, 65,
-       0, 65, 65, 65, 65, 65, 65, 65, 65, 65,
-      65, 65, 65, 65, 65,  0, 65,  0, 65,  5,
-      20, 15, 10, 30, 65, 15, 65, 65, 20,  0,
-      10, 35, 20, 65, 10,  5,  0, 10,  5, 65,
-      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
-      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
-      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
-      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
-      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
-      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
-      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
-      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
-      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
-      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
-      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
-      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
-      65, 65, 65, 65, 65, 65, 65, 65, 65, 65,
-      65, 65, 65, 65, 65, 65
+      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
+      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
+      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
+      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
+      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
+      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
+      67, 67, 67, 67, 67, 67, 67, 67, 67,  0,
+      67, 67, 67, 67, 67, 67, 15, 67, 67, 67,
+       0, 67, 67, 67, 67, 67, 67, 67, 67, 67,
+      67, 67, 67, 67, 67,  0, 67,  0, 67,  5,
+      25, 20, 15, 30, 67, 15, 67, 67, 10,  0,
+      10, 40, 20, 67, 10,  5,  0, 10, 15, 67,
+      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
+      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
+      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
+      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
+      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
+      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
+      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
+      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
+      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
+      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
+      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
+      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
+      67, 67, 67, 67, 67, 67, 67, 67, 67, 67,
+      67, 67, 67, 67, 67, 67
     };
   return len + asso_values[(unsigned char)str[2]] + asso_values[(unsigned char)str[0]] + asso_values[(unsigned char)str[len - 1]];
 }
 
 #ifdef __GNUC__
 __inline
-#ifdef __GNUC_STDC_INLINE__
+#if defined __GNUC_STDC_INLINE__ || defined __GNUC_GNU_INLINE__
 __attribute__ ((__gnu_inline__))
 #endif
 #endif
@@ -89,116 +89,119 @@ is_reserved_word (register const char *str, register unsigned int len)
 {
   enum
     {
-      TOTAL_KEYWORDS = 43,
+      TOTAL_KEYWORDS = 45,
       MIN_WORD_LENGTH = 3,
       MAX_WORD_LENGTH = 24,
       MIN_HASH_VALUE = 3,
-      MAX_HASH_VALUE = 64
+      MAX_HASH_VALUE = 66
     };
 
   static const struct resword wordlist[] =
     {
       {""}, {""}, {""},
-#line 28 "scripts/genksyms/keywords.gperf"
+#line 30 "scripts/genksyms/keywords.gperf"
       {"asm", ASM_KEYW},
       {""},
-#line 10 "scripts/genksyms/keywords.gperf"
+#line 12 "scripts/genksyms/keywords.gperf"
       {"__asm", ASM_KEYW},
       {""},
-#line 11 "scripts/genksyms/keywords.gperf"
+#line 13 "scripts/genksyms/keywords.gperf"
       {"__asm__", ASM_KEYW},
       {""}, {""},
-#line 54 "scripts/genksyms/keywords.gperf"
+#line 56 "scripts/genksyms/keywords.gperf"
       {"__typeof__", TYPEOF_KEYW},
       {""},
-#line 14 "scripts/genksyms/keywords.gperf"
+#line 16 "scripts/genksyms/keywords.gperf"
       {"__const", CONST_KEYW},
-#line 13 "scripts/genksyms/keywords.gperf"
-      {"__attribute__", ATTRIBUTE_KEYW},
 #line 15 "scripts/genksyms/keywords.gperf"
+      {"__attribute__", ATTRIBUTE_KEYW},
+#line 17 "scripts/genksyms/keywords.gperf"
       {"__const__", CONST_KEYW},
-#line 20 "scripts/genksyms/keywords.gperf"
+#line 22 "scripts/genksyms/keywords.gperf"
       {"__signed__", SIGNED_KEYW},
-#line 46 "scripts/genksyms/keywords.gperf"
+#line 48 "scripts/genksyms/keywords.gperf"
       {"static", STATIC_KEYW},
-#line 22 "scripts/genksyms/keywords.gperf"
-      {"__volatile__", VOLATILE_KEYW},
-#line 41 "scripts/genksyms/keywords.gperf"
+      {""},
+#line 43 "scripts/genksyms/keywords.gperf"
       {"int", INT_KEYW},
-#line 34 "scripts/genksyms/keywords.gperf"
+#line 36 "scripts/genksyms/keywords.gperf"
       {"char", CHAR_KEYW},
-#line 35 "scripts/genksyms/keywords.gperf"
+#line 37 "scripts/genksyms/keywords.gperf"
       {"const", CONST_KEYW},
-#line 47 "scripts/genksyms/keywords.gperf"
+#line 49 "scripts/genksyms/keywords.gperf"
       {"struct", STRUCT_KEYW},
-#line 26 "scripts/genksyms/keywords.gperf"
+#line 28 "scripts/genksyms/keywords.gperf"
       {"__restrict__", RESTRICT_KEYW},
-#line 27 "scripts/genksyms/keywords.gperf"
+#line 29 "scripts/genksyms/keywords.gperf"
       {"restrict", RESTRICT_KEYW},
-#line 25 "scripts/genksyms/keywords.gperf"
-      {"_restrict", RESTRICT_KEYW},
-#line 18 "scripts/genksyms/keywords.gperf"
+#line 9 "scripts/genksyms/keywords.gperf"
+      {"EXPORT_SYMBOL_GPL_FUTURE", EXPORT_SYMBOL_KEYW},
+#line 20 "scripts/genksyms/keywords.gperf"
       {"__inline__", INLINE_KEYW},
-#line 12 "scripts/genksyms/keywords.gperf"
-      {"__attribute", ATTRIBUTE_KEYW},
       {""},
-#line 16 "scripts/genksyms/keywords.gperf"
+#line 24 "scripts/genksyms/keywords.gperf"
+      {"__volatile__", VOLATILE_KEYW},
+#line 7 "scripts/genksyms/keywords.gperf"
+      {"EXPORT_SYMBOL", EXPORT_SYMBOL_KEYW},
+#line 27 "scripts/genksyms/keywords.gperf"
+      {"_restrict", RESTRICT_KEYW},
+      {""},
+#line 14 "scripts/genksyms/keywords.gperf"
+      {"__attribute", ATTRIBUTE_KEYW},
+#line 8 "scripts/genksyms/keywords.gperf"
+      {"EXPORT_SYMBOL_GPL", EXPORT_SYMBOL_KEYW},
+#line 18 "scripts/genksyms/keywords.gperf"
       {"__extension__", EXTENSION_KEYW},
-#line 37 "scripts/genksyms/keywords.gperf"
+#line 39 "scripts/genksyms/keywords.gperf"
       {"enum", ENUM_KEYW},
-#line 21 "scripts/genksyms/keywords.gperf"
-      {"__volatile", VOLATILE_KEYW},
-#line 38 "scripts/genksyms/keywords.gperf"
+#line 10 "scripts/genksyms/keywords.gperf"
+      {"EXPORT_UNUSED_SYMBOL", EXPORT_SYMBOL_KEYW},
+#line 40 "scripts/genksyms/keywords.gperf"
       {"extern", EXTERN_KEYW},
       {""},
-#line 19 "scripts/genksyms/keywords.gperf"
+#line 21 "scripts/genksyms/keywords.gperf"
       {"__signed", SIGNED_KEYW},
-#line 9 "scripts/genksyms/keywords.gperf"
-      {"EXPORT_SYMBOL_GPL_FUTURE", EXPORT_SYMBOL_KEYW},
-      {""},
-#line 53 "scripts/genksyms/keywords.gperf"
+#line 11 "scripts/genksyms/keywords.gperf"
+      {"EXPORT_UNUSED_SYMBOL_GPL", EXPORT_SYMBOL_KEYW},
+#line 51 "scripts/genksyms/keywords.gperf"
+      {"union", UNION_KEYW},
+#line 55 "scripts/genksyms/keywords.gperf"
       {"typeof", TYPEOF_KEYW},
-#line 48 "scripts/genksyms/keywords.gperf"
+#line 50 "scripts/genksyms/keywords.gperf"
       {"typedef", TYPEDEF_KEYW},
-#line 17 "scripts/genksyms/keywords.gperf"
+#line 19 "scripts/genksyms/keywords.gperf"
       {"__inline", INLINE_KEYW},
-#line 33 "scripts/genksyms/keywords.gperf"
+#line 35 "scripts/genksyms/keywords.gperf"
       {"auto", AUTO_KEYW},
-#line 49 "scripts/genksyms/keywords.gperf"
-      {"union", UNION_KEYW},
-      {""}, {""},
-#line 50 "scripts/genksyms/keywords.gperf"
-      {"unsigned", UNSIGNED_KEYW},
-#line 51 "scripts/genksyms/keywords.gperf"
-      {"void", VOID_KEYW},
-#line 44 "scripts/genksyms/keywords.gperf"
-      {"short", SHORT_KEYW},
+#line 23 "scripts/genksyms/keywords.gperf"
+      {"__volatile", VOLATILE_KEYW},
       {""}, {""},
 #line 52 "scripts/genksyms/keywords.gperf"
-      {"volatile", VOLATILE_KEYW},
-      {""},
-#line 39 "scripts/genksyms/keywords.gperf"
-      {"float", FLOAT_KEYW},
-#line 36 "scripts/genksyms/keywords.gperf"
-      {"double", DOUBLE_KEYW},
+      {"unsigned", UNSIGNED_KEYW},
       {""},
-#line 7 "scripts/genksyms/keywords.gperf"
-      {"EXPORT_SYMBOL", EXPORT_SYMBOL_KEYW},
-      {""}, {""},
-#line 40 "scripts/genksyms/keywords.gperf"
+#line 46 "scripts/genksyms/keywords.gperf"
+      {"short", SHORT_KEYW},
+#line 42 "scripts/genksyms/keywords.gperf"
       {"inline", INLINE_KEYW},
-#line 8 "scripts/genksyms/keywords.gperf"
-      {"EXPORT_SYMBOL_GPL", EXPORT_SYMBOL_KEYW},
-#line 43 "scripts/genksyms/keywords.gperf"
-      {"register", REGISTER_KEYW},
       {""},
-#line 24 "scripts/genksyms/keywords.gperf"
+#line 54 "scripts/genksyms/keywords.gperf"
+      {"volatile", VOLATILE_KEYW},
+#line 44 "scripts/genksyms/keywords.gperf"
+      {"long", LONG_KEYW},
+#line 26 "scripts/genksyms/keywords.gperf"
       {"_Bool", BOOL_KEYW},
-#line 45 "scripts/genksyms/keywords.gperf"
-      {"signed", SIGNED_KEYW},
       {""}, {""},
-#line 42 "scripts/genksyms/keywords.gperf"
-      {"long", LONG_KEYW}
+#line 45 "scripts/genksyms/keywords.gperf"
+      {"register", REGISTER_KEYW},
+#line 53 "scripts/genksyms/keywords.gperf"
+      {"void", VOID_KEYW},
+#line 41 "scripts/genksyms/keywords.gperf"
+      {"float", FLOAT_KEYW},
+#line 38 "scripts/genksyms/keywords.gperf"
+      {"double", DOUBLE_KEYW},
+      {""}, {""}, {""}, {""},
+#line 47 "scripts/genksyms/keywords.gperf"
+      {"signed", SIGNED_KEYW}
     };
 
   if (len <= MAX_WORD_LENGTH && len >= MIN_WORD_LENGTH)
diff --git a/scripts/genksyms/keywords.gperf b/scripts/genksyms/keywords.gperf
index 8fe977a4d57b..e6349acb6f2f 100644
--- a/scripts/genksyms/keywords.gperf
+++ b/scripts/genksyms/keywords.gperf
@@ -7,6 +7,8 @@ struct resword { const char *name; int token; }
 EXPORT_SYMBOL, EXPORT_SYMBOL_KEYW
 EXPORT_SYMBOL_GPL, EXPORT_SYMBOL_KEYW
 EXPORT_SYMBOL_GPL_FUTURE, EXPORT_SYMBOL_KEYW
+EXPORT_UNUSED_SYMBOL, EXPORT_SYMBOL_KEYW
+EXPORT_UNUSED_SYMBOL_GPL, EXPORT_SYMBOL_KEYW
 __asm, ASM_KEYW
 __asm__, ASM_KEYW
 __attribute, ATTRIBUTE_KEYW
diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl
index 81a67a458e78..090f24839700 100755
--- a/scripts/get_maintainer.pl
+++ b/scripts/get_maintainer.pl
@@ -13,7 +13,7 @@
 use strict;
 
 my $P = $0;
-my $V = '0.21';
+my $V = '0.23';
 
 use Getopt::Long qw(:config no_auto_abbrev);
 
@@ -23,16 +23,19 @@ my $email_usename = 1;
 my $email_maintainer = 1;
 my $email_list = 1;
 my $email_subscriber_list = 0;
-my $email_git = 1;
 my $email_git_penguin_chiefs = 0;
+my $email_git = 1;
+my $email_git_blame = 0;
 my $email_git_min_signatures = 1;
 my $email_git_max_maintainers = 5;
 my $email_git_min_percent = 5;
 my $email_git_since = "1-year-ago";
-my $email_git_blame = 0;
+my $email_hg_since = "-365";
 my $email_remove_duplicates = 1;
 my $output_multiline = 1;
 my $output_separator = ", ";
+my $output_roles = 0;
+my $output_rolestats = 0;
 my $scm = 0;
 my $web = 0;
 my $subsystem = 0;
@@ -64,21 +67,52 @@ my $penguin_chiefs = "\(" . join("|",@penguin_chief_names) . "\)";
 my $rfc822_lwsp = "(?:(?:\\r\\n)?[ \\t])";
 my $rfc822_char = '[\\000-\\377]';
 
+# VCS command support: class-like functions and strings
+
+my %VCS_cmds;
+
+my %VCS_cmds_git = (
+    "execute_cmd" => \&git_execute_cmd,
+    "available" => '(which("git") ne "") && (-d ".git")',
+    "find_signers_cmd" => "git log --since=\$email_git_since -- \$file",
+    "find_commit_signers_cmd" => "git log -1 \$commit",
+    "blame_range_cmd" => "git blame -l -L \$diff_start,+\$diff_length \$file",
+    "blame_file_cmd" => "git blame -l \$file",
+    "commit_pattern" => "^commit [0-9a-f]{40,40}",
+    "blame_commit_pattern" => "^([0-9a-f]+) "
+);
+
+my %VCS_cmds_hg = (
+    "execute_cmd" => \&hg_execute_cmd,
+    "available" => '(which("hg") ne "") && (-d ".hg")',
+    "find_signers_cmd" =>
+        "hg log --date=\$email_hg_since" .
+                " --template='commit {node}\\n{desc}\\n' -- \$file",
+    "find_commit_signers_cmd" => "hg log --template='{desc}\\n' -r \$commit",
+    "blame_range_cmd" => "",            # not supported
+    "blame_file_cmd" => "hg blame -c \$file",
+    "commit_pattern" => "^commit [0-9a-f]{40,40}",
+    "blame_commit_pattern" => "^([0-9a-f]+):"
+);
+
 if (!GetOptions(
                 'email!' => \$email,
                 'git!' => \$email_git,
+                'git-blame!' => \$email_git_blame,
                 'git-chief-penguins!' => \$email_git_penguin_chiefs,
                 'git-min-signatures=i' => \$email_git_min_signatures,
                 'git-max-maintainers=i' => \$email_git_max_maintainers,
                 'git-min-percent=i' => \$email_git_min_percent,
                 'git-since=s' => \$email_git_since,
-                'git-blame!' => \$email_git_blame,
+                'hg-since=s' => \$email_hg_since,
                 'remove-duplicates!' => \$email_remove_duplicates,
                 'm!' => \$email_maintainer,
                 'n!' => \$email_usename,
                 'l!' => \$email_list,
                 's!' => \$email_subscriber_list,
                 'multiline!' => \$output_multiline,
+                'roles!' => \$output_roles,
+                'rolestats!' => \$output_rolestats,
                 'separator=s' => \$output_separator,
                 'subsystem!' => \$subsystem,
                 'status!' => \$status,
@@ -90,8 +124,7 @@ if (!GetOptions(
                 'v|version' => \$version,
                 'h|help' => \$help,
                 )) {
-    usage();
-    die "$P: invalid argument\n";
+    die "$P: invalid argument - use --help if necessary\n";
 }
 
 if ($help != 0) {
@@ -113,6 +146,10 @@ if ($output_separator ne ", ") {
     $output_multiline = 0;
 }
 
+if ($output_rolestats) {
+    $output_roles = 1;
+}
+
 my $selections = $email + $scm + $status + $subsystem + $web;
 if ($selections == 0) {
     usage();
@@ -175,7 +212,7 @@ if ($email_remove_duplicates) {
         next if ($line =~ m/^\s*$/);
 
         my ($name, $address) = parse_email($line);
-        $line = format_email($name, $address);
+        $line = format_email($name, $address, $email_usename);
 
         next if ($line =~ m/^\s*$/);
 
@@ -207,12 +244,10 @@ foreach my $file (@ARGV) {
         push(@files, $file);
         if (-f $file && $keywords) {
             open(FILE, "<$file") or die "$P: Can't open ${file}\n";
-            while (<FILE>) {
-                my $patch_line = $_;
-                foreach my $line (keys %keyword_hash) {
-                    if ($patch_line =~ m/^.*$keyword_hash{$line}/x) {
-                        push(@keyword_tvi, $line);
-                    }
+            my $text = do { local($/) ; <FILE> };
+            foreach my $line (keys %keyword_hash) {
+                if ($text =~ m/$keyword_hash{$line}/x) {
+                    push(@keyword_tvi, $line);
                 }
             }
             close(FILE);
@@ -261,54 +296,64 @@ my @status = ();
 
 foreach my $file (@files) {
 
-#Do not match excluded file patterns
-
-    my $exclude = 0;
-    foreach my $line (@typevalue) {
-        if ($line =~ m/^(\C):\s*(.*)/) {
-            my $type = $1;
-            my $value = $2;
-            if ($type eq 'X') {
-                if (file_match_pattern($file, $value)) {
-                    $exclude = 1;
-                    last;
-                }
-            }
-        }
-    }
+    my %hash;
+    my $tvi = find_first_section();
+    while ($tvi < @typevalue) {
+        my $start = find_starting_index($tvi);
+        my $end = find_ending_index($tvi);
+        my $exclude = 0;
+        my $i;
 
-    if (!$exclude) {
-        my $tvi = 0;
-        my %hash;
-        foreach my $line (@typevalue) {
+        #Do not match excluded file patterns
+
+        for ($i = $start; $i < $end; $i++) {
+            my $line = $typevalue[$i];
             if ($line =~ m/^(\C):\s*(.*)/) {
                 my $type = $1;
                 my $value = $2;
-                if ($type eq 'F') {
+                if ($type eq 'X') {
                     if (file_match_pattern($file, $value)) {
-                        my $value_pd = ($value =~ tr@/@@);
-                        my $file_pd = ($file  =~ tr@/@@);
-                        $value_pd++ if (substr($value,-1,1) ne "/");
-                        if ($pattern_depth == 0 ||
-                            (($file_pd - $value_pd) < $pattern_depth)) {
-                            $hash{$tvi} = $value_pd;
-                        }
+                        $exclude = 1;
                     }
                 }
             }
-            $tvi++;
         }
-        foreach my $line (sort {$hash{$b} <=> $hash{$a}} keys %hash) {
-            add_categories($line);
+
+        if (!$exclude) {
+            for ($i = $start; $i < $end; $i++) {
+                my $line = $typevalue[$i];
+                if ($line =~ m/^(\C):\s*(.*)/) {
+                    my $type = $1;
+                    my $value = $2;
+                    if ($type eq 'F') {
+                        if (file_match_pattern($file, $value)) {
+                            my $value_pd = ($value =~ tr@/@@);
+                            my $file_pd = ($file  =~ tr@/@@);
+                            $value_pd++ if (substr($value,-1,1) ne "/");
+                            if ($pattern_depth == 0 ||
+                                (($file_pd - $value_pd) < $pattern_depth)) {
+                                $hash{$tvi} = $value_pd;
+                            }
+                        }
+                    }
+                }
+            }
         }
+
+        $tvi += ($end - $start);
+
+    }
+
+    foreach my $line (sort {$hash{$b} <=> $hash{$a}} keys %hash) {
+        add_categories($line);
     }
 
     if ($email && $email_git) {
-        recent_git_signoffs($file);
+        vcs_file_signoffs($file);
     }
 
     if ($email && $email_git_blame) {
-        git_assign_blame($file);
+        vcs_file_blame($file);
     }
 }
 
@@ -324,11 +369,11 @@ if ($email) {
         if ($chief =~ m/^(.*):(.*)/) {
             my $email_address;
 
-            $email_address = format_email($1, $2);
+            $email_address = format_email($1, $2, $email_usename);
             if ($email_git_penguin_chiefs) {
-                push(@email_to, $email_address);
+                push(@email_to, [$email_address, 'chief penguin']);
             } else {
-                @email_to = grep(!/${email_address}/, @email_to);
+                @email_to = grep($_->[0] !~ /${email_address}/, @email_to);
             }
         }
     }
@@ -342,7 +387,7 @@ if ($email || $email_list) {
     if ($email_list) {
         @to = (@to, @list_to);
     }
-    output(uniq(@to));
+    output(merge_email(@to));
 }
 
 if ($scm) {
@@ -398,13 +443,16 @@ MAINTAINER field selection options:
     --git-min-signatures => number of signatures required (default: 1)
     --git-max-maintainers => maximum maintainers to add (default: 5)
     --git-min-percent => minimum percentage of commits required (default: 5)
-    --git-since => git history to use (default: 1-year-ago)
     --git-blame => use git blame to find modified commits for patch or file
+    --git-since => git history to use (default: 1-year-ago)
+    --hg-since => hg history to use (default: -365)
     --m => include maintainer(s) if any
     --n => include name 'Full Name <addr\@domain.tld>'
     --l => include list(s) if any
     --s => include subscriber only list(s) if any
     --remove-duplicates => minimize duplicate email names/addresses
+    --roles => show roles (status:subsystem, git-signer, list, etc...)
+    --rolestats => show roles and statistics (commits/total_commits, %)
   --scm => print SCM tree(s) if any
   --status => print status if any
   --subsystem => print subsystem name if any
@@ -430,11 +478,24 @@ Notes:
           directory are examined as git recurses directories.
           Any specified X: (exclude) pattern matches are _not_ ignored.
       Used with "--nogit", directory is used as a pattern match,
-         no individual file within the directory or subdirectory
-         is matched.
+          no individual file within the directory or subdirectory
+          is matched.
       Used with "--git-blame", does not iterate all files in directory
   Using "--git-blame" is slow and may add old committers and authors
       that are no longer active maintainers to the output.
+  Using "--roles" or "--rolestats" with git send-email --cc-cmd or any
+      other automated tools that expect only ["name"] <email address>
+      may not work because of additional output after <email address>.
+  Using "--rolestats" and "--git-blame" shows the #/total=% commits,
+      not the percentage of the entire file authored.  # of commits is
+      not a good measure of amount of code authored.  1 major commit may
+      contain a thousand lines, 5 trivial commits may modify a single line.
+  If git is not installed, but mercurial (hg) is installed and an .hg
+      repository exists, the following options apply to mercurial:
+          --git,
+          --git-min-signatures, --git-max-maintainers, --git-min-percent, and
+          --git-blame
+      Use --hg-since not --git-since to control date selection
 EOT
 }
 
@@ -493,7 +554,7 @@ sub parse_email {
 }
 
 sub format_email {
-    my ($name, $address) = @_;
+    my ($name, $address, $usename) = @_;
 
     my $formatted_email;
 
@@ -506,11 +567,11 @@ sub format_email {
         $name = "\"$name\"";
     }
 
-    if ($email_usename) {
+    if ($usename) {
         if ("$name" eq "") {
             $formatted_email = "$address";
         } else {
-            $formatted_email = "$name <${address}>";
+            $formatted_email = "$name <$address>";
         }
     } else {
         $formatted_email = $address;
@@ -519,6 +580,20 @@ sub format_email {
     return $formatted_email;
 }
 
+sub find_first_section {
+    my $index = 0;
+
+    while ($index < @typevalue) {
+        my $tv = $typevalue[$index];
+        if (($tv =~ m/^(\C):\s*(.*)/)) {
+            last;
+        }
+        $index++;
+    }
+
+    return $index;
+}
+
 sub find_starting_index {
     my ($index) = @_;
 
@@ -547,6 +622,71 @@ sub find_ending_index {
     return $index;
 }
 
+sub get_maintainer_role {
+    my ($index) = @_;
+
+    my $i;
+    my $start = find_starting_index($index);
+    my $end = find_ending_index($index);
+
+    my $role;
+    my $subsystem = $typevalue[$start];
+    if (length($subsystem) > 20) {
+        $subsystem = substr($subsystem, 0, 17);
+        $subsystem =~ s/\s*$//;
+        $subsystem = $subsystem . "...";
+    }
+
+    for ($i = $start + 1; $i < $end; $i++) {
+        my $tv = $typevalue[$i];
+        if ($tv =~ m/^(\C):\s*(.*)/) {
+            my $ptype = $1;
+            my $pvalue = $2;
+            if ($ptype eq "S") {
+                $role = $pvalue;
+            }
+        }
+    }
+
+    $role = lc($role);
+    if      ($role eq "supported") {
+        $role = "supporter";
+    } elsif ($role eq "maintained") {
+        $role = "maintainer";
+    } elsif ($role eq "odd fixes") {
+        $role = "odd fixer";
+    } elsif ($role eq "orphan") {
+        $role = "orphan minder";
+    } elsif ($role eq "obsolete") {
+        $role = "obsolete minder";
+    } elsif ($role eq "buried alive in reporters") {
+        $role = "chief penguin";
+    }
+
+    return $role . ":" . $subsystem;
+}
+
+sub get_list_role {
+    my ($index) = @_;
+
+    my $i;
+    my $start = find_starting_index($index);
+    my $end = find_ending_index($index);
+
+    my $subsystem = $typevalue[$start];
+    if (length($subsystem) > 20) {
+        $subsystem = substr($subsystem, 0, 17);
+        $subsystem =~ s/\s*$//;
+        $subsystem = $subsystem . "...";
+    }
+
+    if ($subsystem eq "THE REST") {
+        $subsystem = "";
+    }
+
+    return $subsystem;
+}
+
 sub add_categories {
     my ($index) = @_;
 
@@ -564,17 +704,22 @@ sub add_categories {
             if ($ptype eq "L") {
                 my $list_address = $pvalue;
                 my $list_additional = "";
+                my $list_role = get_list_role($i);
+
+                if ($list_role ne "") {
+                    $list_role = ":" . $list_role;
+                }
                 if ($list_address =~ m/([^\s]+)\s+(.*)$/) {
                     $list_address = $1;
                     $list_additional = $2;
                 }
                 if ($list_additional =~ m/subscribers-only/) {
                     if ($email_subscriber_list) {
-                        push(@list_to, $list_address);
+                        push(@list_to, [$list_address, "subscriber list${list_role}"]);
                     }
                 } else {
                     if ($email_list) {
-                        push(@list_to, $list_address);
+                        push(@list_to, [$list_address, "open list${list_role}"]);
                     }
                 }
             } elsif ($ptype eq "M") {
@@ -585,13 +730,14 @@ sub add_categories {
                         if ($tv =~ m/^(\C):\s*(.*)/) {
                             if ($1 eq "P") {
                                 $name = $2;
-                                $pvalue = format_email($name, $address);
+                                $pvalue = format_email($name, $address, $email_usename);
                             }
                         }
                     }
                 }
                 if ($email_maintainer) {
-                    push_email_addresses($pvalue);
+                    my $role = get_maintainer_role($i);
+                    push_email_addresses($pvalue, $role);
                 }
             } elsif ($ptype eq "T") {
                 push(@scm, $pvalue);
@@ -618,7 +764,7 @@ sub email_inuse {
 }
 
 sub push_email_address {
-    my ($line) = @_;
+    my ($line, $role) = @_;
 
     my ($name, $address) = parse_email($line);
 
@@ -627,9 +773,9 @@ sub push_email_address {
     }
 
     if (!$email_remove_duplicates) {
-        push(@email_to, format_email($name, $address));
+        push(@email_to, [format_email($name, $address, $email_usename), $role]);
     } elsif (!email_inuse($name, $address)) {
-        push(@email_to, format_email($name, $address));
+        push(@email_to, [format_email($name, $address, $email_usename), $role]);
         $email_hash_name{$name}++;
         $email_hash_address{$address}++;
     }
@@ -638,24 +784,52 @@ sub push_email_address {
 }
 
 sub push_email_addresses {
-    my ($address) = @_;
+    my ($address, $role) = @_;
 
     my @address_list = ();
 
     if (rfc822_valid($address)) {
-        push_email_address($address);
+        push_email_address($address, $role);
     } elsif (@address_list = rfc822_validlist($address)) {
         my $array_count = shift(@address_list);
         while (my $entry = shift(@address_list)) {
-            push_email_address($entry);
+            push_email_address($entry, $role);
         }
     } else {
-        if (!push_email_address($address)) {
+        if (!push_email_address($address, $role)) {
             warn("Invalid MAINTAINERS address: '" . $address . "'\n");
         }
     }
 }
 
+sub add_role {
+    my ($line, $role) = @_;
+
+    my ($name, $address) = parse_email($line);
+    my $email = format_email($name, $address, $email_usename);
+
+    foreach my $entry (@email_to) {
+        if ($email_remove_duplicates) {
+            my ($entry_name, $entry_address) = parse_email($entry->[0]);
+            if ($name eq $entry_name || $address eq $entry_address) {
+                if ($entry->[1] eq "") {
+                    $entry->[1] = "$role";
+                } else {
+                    $entry->[1] = "$entry->[1],$role";
+                }
+            }
+        } else {
+            if ($email eq $entry->[0]) {
+                if ($entry->[1] eq "") {
+                    $entry->[1] = "$role";
+                } else {
+                    $entry->[1] = "$entry->[1],$role";
+                }
+            }
+        }
+    }
+}
+
 sub which {
     my ($bin) = @_;
 
@@ -669,7 +843,7 @@ sub which {
 }
 
 sub mailmap {
-    my @lines = @_;
+    my (@lines) = @_;
     my %hash;
 
     foreach my $line (@lines) {
@@ -678,14 +852,14 @@ sub mailmap {
             $hash{$name} = $address;
         } elsif ($address ne $hash{$name}) {
             $address = $hash{$name};
-            $line = format_email($name, $address);
+            $line = format_email($name, $address, $email_usename);
         }
         if (exists($mailmap{$name})) {
             my $obj = $mailmap{$name};
             foreach my $map_address (@$obj) {
                 if (($map_address eq $address) &&
                     ($map_address ne $hash{$name})) {
-                    $line = format_email($name, $hash{$name});
+                    $line = format_email($name, $hash{$name}, $email_usename);
                 }
             }
         }
@@ -694,34 +868,38 @@ sub mailmap {
     return @lines;
 }
 
-sub recent_git_signoffs {
-    my ($file) = @_;
-
-    my $sign_offs = "";
-    my $cmd = "";
-    my $output = "";
-    my $count = 0;
+sub git_execute_cmd {
+    my ($cmd) = @_;
     my @lines = ();
-    my %hash;
-    my $total_sign_offs;
 
-    if (which("git") eq "") {
-        warn("$P: git not found.  Add --nogit to options?\n");
-        return;
-    }
-    if (!(-d ".git")) {
-        warn("$P: .git directory not found.  Use a git repository for better results.\n");
-        warn("$P: perhaps 'git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git'\n");
-        return;
-    }
+    my $output = `$cmd`;
+    $output =~ s/^\s*//gm;
+    @lines = split("\n", $output);
 
-    $cmd = "git log --since=${email_git_since} -- ${file}";
+    return @lines;
+}
 
-    $output = `${cmd}`;
-    $output =~ s/^\s*//gm;
+sub hg_execute_cmd {
+    my ($cmd) = @_;
+    my @lines = ();
 
+    my $output = `$cmd`;
     @lines = split("\n", $output);
 
+    return @lines;
+}
+
+sub vcs_find_signers {
+    my ($cmd) = @_;
+    my @lines = ();
+    my $commits;
+
+    @lines = &{$VCS_cmds{"execute_cmd"}}($cmd);
+
+    my $pattern = $VCS_cmds{"commit_pattern"};
+
+    $commits = grep(/$pattern/, @lines);        # of commits
+
     @lines = grep(/^[-_         a-z]+by:.*\@.*$/i, @lines);
     if (!$email_git_penguin_chiefs) {
         @lines = grep(!/${penguin_chiefs}/i, @lines);
@@ -729,111 +907,183 @@ sub recent_git_signoffs {
     # cut -f2- -d":"
     s/.*:\s*(.+)\s*/$1/ for (@lines);
 
-    $total_sign_offs = @lines;
+## Reformat email addresses (with names) to avoid badly written signatures
 
-    if ($email_remove_duplicates) {
-        @lines = mailmap(@lines);
+    foreach my $line (@lines) {
+        my ($name, $address) = parse_email($line);
+        $line = format_email($name, $address, 1);
     }
 
-    @lines = sort(@lines);
-
-    # uniq -c
-    $hash{$_}++ for @lines;
-
-    # sort -rn
-    foreach my $line (sort {$hash{$b} <=> $hash{$a}} keys %hash) {
-        my $sign_offs = $hash{$line};
-        $count++;
-        last if ($sign_offs < $email_git_min_signatures ||
-                 $count > $email_git_max_maintainers ||
-                 $sign_offs * 100 / $total_sign_offs < $email_git_min_percent);
-        push_email_address($line);
-    }
+    return ($commits, @lines);
 }
 
-sub save_commits {
-    my ($cmd, @commits) = @_;
-    my $output;
+sub vcs_save_commits {
+    my ($cmd) = @_;
     my @lines = ();
+    my @commits = ();
 
-    $output = `${cmd}`;
+    @lines = &{$VCS_cmds{"execute_cmd"}}($cmd);
 
-    @lines = split("\n", $output);
     foreach my $line (@lines) {
-        if ($line =~ m/^(\w+) /) {
-            push (@commits, $1);
+        if ($line =~ m/$VCS_cmds{"blame_commit_pattern"}/) {
+            push(@commits, $1);
         }
     }
+
     return @commits;
 }
 
-sub git_assign_blame {
+sub vcs_blame {
     my ($file) = @_;
-
-    my @lines = ();
-    my @commits = ();
     my $cmd;
-    my $output;
-    my %hash;
-    my $total_sign_offs;
-    my $count;
+    my @commits = ();
+
+    return @commits if (!(-f $file));
+
+    if (@range && $VCS_cmds{"blame_range_cmd"} eq "") {
+        my @all_commits = ();
+
+        $cmd = $VCS_cmds{"blame_file_cmd"};
+        $cmd =~ s/(\$\w+)/$1/eeg;               #interpolate $cmd
+        @all_commits = vcs_save_commits($cmd);
 
-    if (@range) {
         foreach my $file_range_diff (@range) {
             next if (!($file_range_diff =~ m/(.+):(.+):(.+)/));
             my $diff_file = $1;
             my $diff_start = $2;
             my $diff_length = $3;
-            next if (!("$file" eq "$diff_file"));
-            $cmd = "git blame -l -L $diff_start,+$diff_length $file";
-            @commits = save_commits($cmd, @commits);
+            next if ("$file" ne "$diff_file");
+            for (my $i = $diff_start; $i < $diff_start + $diff_length; $i++) {
+                push(@commits, $all_commits[$i]);
+            }
         }
-    } else {
-        if (-f $file) {
-            $cmd = "git blame -l $file";
-            @commits = save_commits($cmd, @commits);
+    } elsif (@range) {
+        foreach my $file_range_diff (@range) {
+            next if (!($file_range_diff =~ m/(.+):(.+):(.+)/));
+            my $diff_file = $1;
+            my $diff_start = $2;
+            my $diff_length = $3;
+            next if ("$file" ne "$diff_file");
+            $cmd = $VCS_cmds{"blame_range_cmd"};
+            $cmd =~ s/(\$\w+)/$1/eeg;           #interpolate $cmd
+            push(@commits, vcs_save_commits($cmd));
         }
+    } else {
+        $cmd = $VCS_cmds{"blame_file_cmd"};
+        $cmd =~ s/(\$\w+)/$1/eeg;               #interpolate $cmd
+        @commits = vcs_save_commits($cmd);
     }
 
-    $total_sign_offs = 0;
-    @commits = uniq(@commits);
-    foreach my $commit (@commits) {
-        $cmd = "git log -1 ${commit}";
+    return @commits;
+}
 
-        $output = `${cmd}`;
-        $output =~ s/^\s*//gm;
-        @lines = split("\n", $output);
+my $printed_novcs = 0;
+sub vcs_exists {
+    %VCS_cmds = %VCS_cmds_git;
+    return 1 if eval $VCS_cmds{"available"};
+    %VCS_cmds = %VCS_cmds_hg;
+    return 1 if eval $VCS_cmds{"available"};
+    %VCS_cmds = ();
+    if (!$printed_novcs) {
+        warn("$P: No supported VCS found.  Add --nogit to options?\n");
+        warn("Using a git repository produces better results.\n");
+        warn("Try Linus Torvalds' latest git repository using:\n");
+        warn("git clone git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6.git\n");
+        $printed_novcs = 1;
+    }
+    return 0;
+}
 
-        @lines = grep(/^[-_     a-z]+by:.*\@.*$/i, @lines);
-        if (!$email_git_penguin_chiefs) {
-            @lines = grep(!/${penguin_chiefs}/i, @lines);
-        }
+sub vcs_assign {
+    my ($role, $divisor, @lines) = @_;
 
-        # cut -f2- -d":"
-        s/.*:\s*(.+)\s*/$1/ for (@lines);
+    my %hash;
+    my $count = 0;
 
-        $total_sign_offs += @lines;
+    return if (@lines <= 0);
 
-        if ($email_remove_duplicates) {
-            @lines = mailmap(@lines);
-        }
+    if ($divisor <= 0) {
+        warn("Bad divisor in " . (caller(0))[3] . ": $divisor\n");
+        $divisor = 1;
+    }
 
-        $hash{$_}++ for @lines;
+    if ($email_remove_duplicates) {
+        @lines = mailmap(@lines);
     }
 
-    $count = 0;
+    @lines = sort(@lines);
+
+    # uniq -c
+    $hash{$_}++ for @lines;
+
+    # sort -rn
     foreach my $line (sort {$hash{$b} <=> $hash{$a}} keys %hash) {
         my $sign_offs = $hash{$line};
+        my $percent = $sign_offs * 100 / $divisor;
+
+        $percent = 100 if ($percent > 100);
         $count++;
         last if ($sign_offs < $email_git_min_signatures ||
                  $count > $email_git_max_maintainers ||
-                 $sign_offs * 100 / $total_sign_offs < $email_git_min_percent);
-        push_email_address($line);
+                 $percent < $email_git_min_percent);
+        push_email_address($line, '');
+        if ($output_rolestats) {
+            my $fmt_percent = sprintf("%.0f", $percent);
+            add_role($line, "$role:$sign_offs/$divisor=$fmt_percent%");
+        } else {
+            add_role($line, $role);
+        }
+    }
+}
+
+sub vcs_file_signoffs {
+    my ($file) = @_;
+
+    my @signers = ();
+    my $commits;
+
+    return if (!vcs_exists());
+
+    my $cmd = $VCS_cmds{"find_signers_cmd"};
+    $cmd =~ s/(\$\w+)/$1/eeg;           # interpolate $cmd
+
+    ($commits, @signers) = vcs_find_signers($cmd);
+    vcs_assign("commit_signer", $commits, @signers);
+}
+
+sub vcs_file_blame {
+    my ($file) = @_;
+
+    my @signers = ();
+    my @commits = ();
+    my $total_commits;
+
+    return if (!vcs_exists());
+
+    @commits = vcs_blame($file);
+    @commits = uniq(@commits);
+    $total_commits = @commits;
+
+    foreach my $commit (@commits) {
+        my $commit_count;
+        my @commit_signers = ();
+
+        my $cmd = $VCS_cmds{"find_commit_signers_cmd"};
+        $cmd =~ s/(\$\w+)/$1/eeg;       #interpolate $cmd
+
+        ($commit_count, @commit_signers) = vcs_find_signers($cmd);
+        push(@signers, @commit_signers);
+    }
+
+    if ($from_filename) {
+        vcs_assign("commits", $total_commits, @signers);
+    } else {
+        vcs_assign("modified commits", $total_commits, @signers);
     }
 }
 
 sub uniq {
-    my @parms = @_;
+    my (@parms) = @_;
 
     my %saw;
     @parms = grep(!$saw{$_}++, @parms);
@@ -841,7 +1091,7 @@ sub uniq {
 }
 
 sub sort_and_uniq {
-    my @parms = @_;
+    my (@parms) = @_;
 
     my %saw;
     @parms = sort @parms;
@@ -849,8 +1099,27 @@ sub sort_and_uniq {
     return @parms;
 }
 
+sub merge_email {
+    my @lines;
+    my %saw;
+
+    for (@_) {
+        my ($address, $role) = @$_;
+        if (!$saw{$address}) {
+            if ($output_roles) {
+                push(@lines, "$address ($role)");
+            } else {
+                push(@lines, $address);
+            }
+            $saw{$address} = 1;
+        }
+    }
+
+    return @lines;
+}
+
 sub output {
-    my @parms = @_;
+    my (@parms) = @_;
 
     if ($output_multiline) {
         foreach my $line (@parms) {
@@ -947,11 +1216,9 @@ sub rfc822_validlist ($) {
     if ($s =~ m/^(?:$rfc822re)?(?:,(?:$rfc822re)?)*$/so &&
         $s =~ m/^$rfc822_char*$/) {
         while ($s =~ m/(?:^|,$rfc822_lwsp*)($rfc822re)/gos) {
-            push @r, $1;
+            push(@r, $1);
         }
         return wantarray ? (scalar(@r), @r) : 1;
     }
-    else {
-        return wantarray ? () : 0;
-    }
+    return wantarray ? () : 0;
 }
diff --git a/scripts/headers.sh b/scripts/headers.sh
index 0308ecc10d5b..1ddcdd38d97f 100755
--- a/scripts/headers.sh
+++ b/scripts/headers.sh
@@ -8,8 +8,6 @@ do_command()
 {
         if [ -f ${srctree}/arch/$2/include/asm/Kbuild ]; then
                 make ARCH=$2 KBUILD_HEADERS=$1 headers_$1
-        elif [ -f ${srctree}/include/asm-$2/Kbuild ]; then
-                make ARCH=$2 KBUILD_HEADERS=$1 headers_$1
         else
                 printf "Ignoring arch: %s\n" ${arch}
         fi
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 80599e3a7994..999e8a7d5bf7 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -27,6 +27,7 @@ oldconfig: $(obj)/conf
         $< -o $(Kconfig)
 
 silentoldconfig: $(obj)/conf
+        $(Q)mkdir -p include/generated
         $< -s $(Kconfig)
 
 localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index b55e72ff2fc6..c4dec80cfd8e 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -677,7 +677,7 @@ int conf_write_autoconf(void)
         struct symbol *sym;
         const char *str;
         const char *name;
-        FILE *out, *out_h;
+        FILE *out, *tristate, *out_h;
         time_t now;
         int i, l;
 
@@ -692,9 +692,16 @@ int conf_write_autoconf(void)
         if (!out)
                 return 1;
 
+        tristate = fopen(".tmpconfig_tristate", "w");
+        if (!tristate) {
+                fclose(out);
+                return 1;
+        }
+
         out_h = fopen(".tmpconfig.h", "w");
         if (!out_h) {
                 fclose(out);
+                fclose(tristate);
                 return 1;
         }
 
@@ -707,6 +714,9 @@ int conf_write_autoconf(void)
                      "# %s"
                      "#\n",
                      sym_get_string_value(sym), ctime(&now));
+        fprintf(tristate, "#\n"
+                          "# Automatically generated - do not edit\n"
+                          "\n");
         fprintf(out_h, "/*\n"
                        " * Automatically generated C config: don't edit\n"
                        " * Linux kernel version: %s\n"
@@ -727,10 +737,14 @@ int conf_write_autoconf(void)
                                 break;
                         case mod:
                                 fprintf(out, "CONFIG_%s=m\n", sym->name);
+                                fprintf(tristate, "CONFIG_%s=M\n", sym->name);
                                 fprintf(out_h, "#define CONFIG_%s_MODULE 1\n", sym->name);
                                 break;
                         case yes:
                                 fprintf(out, "CONFIG_%s=y\n", sym->name);
+                                if (sym->type == S_TRISTATE)
+                                        fprintf(tristate, "CONFIG_%s=Y\n",
+                                                        sym->name);
                                 fprintf(out_h, "#define CONFIG_%s 1\n", sym->name);
                                 break;
                         }
@@ -772,13 +786,19 @@ int conf_write_autoconf(void)
                 }
         }
         fclose(out);
+        fclose(tristate);
         fclose(out_h);
 
         name = getenv("KCONFIG_AUTOHEADER");
         if (!name)
-                name = "include/linux/autoconf.h";
+                name = "include/generated/autoconf.h";
         if (rename(".tmpconfig.h", name))
                 return 1;
+        name = getenv("KCONFIG_TRISTATE");
+        if (!name)
+                name = "include/config/tristate.conf";
+        if (rename(".tmpconfig_tristate", name))
+                return 1;
         name = conf_get_autoconfig_name();
         /*
          * This must be the last step, kbuild has a dependency on auto.conf
diff --git a/scripts/markup_oops.pl b/scripts/markup_oops.pl
index 5f0fcb712e29..ce3e40b01e48 100644
--- a/scripts/markup_oops.pl
+++ b/scripts/markup_oops.pl
@@ -154,7 +154,7 @@ while (<STDIN>) {
         if ($line =~ /RIP: 0010:\[\<([a-z0-9]+)\>\]/) {
                 $target = $1;
         }
-        if ($line =~ /EIP is at ([a-zA-Z0-9\_]+)\+(0x[0-9a-f]+)\/0x[a-f0-9]/) {
+        if ($line =~ /EIP is at ([a-zA-Z0-9\_]+)\+0x([0-9a-f]+)\/0x[a-f0-9]/) {
                 $function = $1;
                 $func_offset = $2;
         }
diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h
index bce3d0fe6fbd..23dbad80cce9 100755
--- a/scripts/mkcompile_h
+++ b/scripts/mkcompile_h
@@ -14,7 +14,7 @@ vecho() { [ "${quiet}" = "silent_" ] || echo "$@" ; }
 # So "sudo make install" won't change the "compiled by <user>"
 # do "compiled by root"
 
-if [ -r $TARGET -a ! -O include/linux/autoconf.h ]; then
+if [ -r $TARGET -a ! -O include/generated/autoconf.h ]; then
   vecho "  SKIPPED $TARGET"
   exit 0
 fi
diff --git a/scripts/mod/Makefile b/scripts/mod/Makefile
index 11d69c35e5b4..ff954f8168c1 100644
--- a/scripts/mod/Makefile
+++ b/scripts/mod/Makefile
@@ -8,7 +8,7 @@ modpost-objs	:= modpost.o file2alias.o sumversion.o
 $(obj)/modpost.o $(obj)/file2alias.o $(obj)/sumversion.o: $(obj)/elfconfig.h
 
 quiet_cmd_elfconfig = MKELF   $@
-      cmd_elfconfig = $(obj)/mk_elfconfig $(ARCH) < $< > $@
+      cmd_elfconfig = $(obj)/mk_elfconfig < $< > $@
 
 $(obj)/elfconfig.h: $(obj)/empty.o $(obj)/mk_elfconfig FORCE
         $(call if_changed,elfconfig)
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 6f426afbc522..220213e603db 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -804,7 +804,7 @@ static inline int sym_is(const char *symbol, const char *name)
         match = strstr(symbol, name);
         if (!match)
                 return 0;
-        return match[strlen(symbol)] == '\0';
+        return match[strlen(name)] == '\0';
 }
 
 static void do_table(void *symval, unsigned long size,
diff --git a/scripts/mod/mk_elfconfig.c b/scripts/mod/mk_elfconfig.c
index 6a96d47bd1e6..639bca7ba559 100644
--- a/scripts/mod/mk_elfconfig.c
+++ b/scripts/mod/mk_elfconfig.c
@@ -9,9 +9,6 @@ main(int argc, char **argv)
         unsigned char ei[EI_NIDENT];
         union { short s; char c[2]; } endian_test;
 
-        if (argc != 2) {
-                fprintf(stderr, "Error: no arch\n");
-        }
         if (fread(ei, 1, EI_NIDENT, stdin) != EI_NIDENT) {
                 fprintf(stderr, "Error: input truncated\n");
                 return 1;
@@ -55,12 +52,6 @@ main(int argc, char **argv)
         else
                 exit(1);
 
-        if ((strcmp(argv[1], "h8300") == 0)
-            || (strcmp(argv[1], "blackfin") == 0))
-                printf("#define MODULE_SYMBOL_PREFIX \"_\"\n");
-        else
-                printf("#define MODULE_SYMBOL_PREFIX \"\"\n");
-
         return 0;
 }
 
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 801a16a17545..20923613467c 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -15,8 +15,17 @@
 #include <stdio.h>
 #include <ctype.h>
 #include "modpost.h"
+#include "../../include/generated/autoconf.h"
 #include "../../include/linux/license.h"
 
+/* Some toolchains use a `_' prefix for all user symbols. */
+#ifdef CONFIG_SYMBOL_PREFIX
+#define MODULE_SYMBOL_PREFIX CONFIG_SYMBOL_PREFIX
+#else
+#define MODULE_SYMBOL_PREFIX ""
+#endif
+
+
 /* Are we using CONFIG_MODVERSIONS? */
 int modversions = 0;
 /* Warn about undefined symbols? (do so if we have vmlinux) */
@@ -451,8 +460,6 @@ static int parse_elf(struct elf_info *info, const char *filename)
                         info->export_unused_gpl_sec = i;
                 else if (strcmp(secname, "__ksymtab_gpl_future") == 0)
                         info->export_gpl_future_sec = i;
-                else if (strcmp(secname, "__markers_strings") == 0)
-                        info->markers_strings_sec = i;
 
                 if (sechdrs[i].sh_type != SHT_SYMTAB)
                         continue;
@@ -515,7 +522,7 @@ static void handle_modversions(struct module *mod, struct elf_info *info,
                 break;
         case SHN_ABS:
                 /* CRC'd symbol */
-                if (memcmp(symname, CRC_PFX, strlen(CRC_PFX)) == 0) {
+                if (strncmp(symname, CRC_PFX, strlen(CRC_PFX)) == 0) {
                         crc = (unsigned int) sym->st_value;
                         sym_update_crc(symname + strlen(CRC_PFX), mod, crc,
                                         export);
@@ -559,7 +566,7 @@ static void handle_modversions(struct module *mod, struct elf_info *info,
                 break;
         default:
                 /* All exported symbols */
-                if (memcmp(symname, KSYMTAB_PFX, strlen(KSYMTAB_PFX)) == 0) {
+                if (strncmp(symname, KSYMTAB_PFX, strlen(KSYMTAB_PFX)) == 0) {
                         sym_add_exported(symname + strlen(KSYMTAB_PFX), mod,
                                         export);
                 }
@@ -1509,62 +1516,6 @@ static void check_sec_ref(struct module *mod, const char *modname,
         }
 }
 
-static void get_markers(struct elf_info *info, struct module *mod)
-{
-        const Elf_Shdr *sh = &info->sechdrs[info->markers_strings_sec];
-        const char *strings = (const char *) info->hdr + sh->sh_offset;
-        const Elf_Sym *sym, *first_sym, *last_sym;
-        size_t n;
-
-        if (!info->markers_strings_sec)
-                return;
-
-        /*
-         * First count the strings.  We look for all the symbols defined
-         * in the __markers_strings section named __mstrtab_*.  For
-         * these local names, the compiler puts a random .NNN suffix on,
-         * so the names don't correspond exactly.
-         */
-        first_sym = last_sym = NULL;
-        n = 0;
-        for (sym = info->symtab_start; sym < info->symtab_stop; sym++)
-                if (ELF_ST_TYPE(sym->st_info) == STT_OBJECT &&
-                    sym->st_shndx == info->markers_strings_sec &&
-                    !strncmp(info->strtab + sym->st_name,
-                             "__mstrtab_", sizeof "__mstrtab_" - 1)) {
-                        if (first_sym == NULL)
-                                first_sym = sym;
-                        last_sym = sym;
-                        ++n;
-                }
-
-        if (n == 0)
-                return;
-
-        /*
-         * Now collect each name and format into a line for the output.
-         * Lines look like:
-         *      marker_name     vmlinux marker %s format %d
-         * The format string after the second \t can use whitespace.
-         */
-        mod->markers = NOFAIL(malloc(sizeof mod->markers[0] * n));
-        mod->nmarkers = n;
-
-        n = 0;
-        for (sym = first_sym; sym <= last_sym; sym++)
-                if (ELF_ST_TYPE(sym->st_info) == STT_OBJECT &&
-                    sym->st_shndx == info->markers_strings_sec &&
-                    !strncmp(info->strtab + sym->st_name,
-                             "__mstrtab_", sizeof "__mstrtab_" - 1)) {
-                        const char *name = strings + sym->st_value;
-                        const char *fmt = strchr(name, '\0') + 1;
-                        char *line = NULL;
-                        asprintf(&line, "%s\t%s\t%s\n", name, mod->name, fmt);
-                        NOFAIL(line);
-                        mod->markers[n++] = line;
-                }
-}
-
 static void read_symbols(char *modname)
 {
         const char *symname;
@@ -1620,8 +1571,6 @@ static void read_symbols(char *modname)
                 get_src_version(modname, mod->srcversion,
                                 sizeof(mod->srcversion)-1);
 
-        get_markers(&info, mod);
-
         parse_elf_finish(&info);
 
         /* Our trick to get versioning for module struct etc. - it's
@@ -1976,96 +1925,6 @@ static void write_dump(const char *fname)
         write_if_changed(&buf, fname);
 }
 
-static void add_marker(struct module *mod, const char *name, const char *fmt)
-{
-        char *line = NULL;
-        asprintf(&line, "%s\t%s\t%s\n", name, mod->name, fmt);
-        NOFAIL(line);
-
-        mod->markers = NOFAIL(realloc(mod->markers, ((mod->nmarkers + 1) *
-                                                     sizeof mod->markers[0])));
-        mod->markers[mod->nmarkers++] = line;
-}
-
-static void read_markers(const char *fname)
-{
-        unsigned long size, pos = 0;
-        void *file = grab_file(fname, &size);
-        char *line;
-
-        if (!file)              /* No old markers, silently ignore */
-                return;
-
-        while ((line = get_next_line(&pos, file, size))) {
-                char *marker, *modname, *fmt;
-                struct module *mod;
-
-                marker = line;
-                modname = strchr(marker, '\t');
-                if (!modname)
-                        goto fail;
-                *modname++ = '\0';
-                fmt = strchr(modname, '\t');
-                if (!fmt)
-                        goto fail;
-                *fmt++ = '\0';
-                if (*marker == '\0' || *modname == '\0')
-                        goto fail;
-
-                mod = find_module(modname);
-                if (!mod) {
-                        mod = new_module(modname);
-                        mod->skip = 1;
-                }
-                if (is_vmlinux(modname)) {
-                        have_vmlinux = 1;
-                        mod->skip = 0;
-                }
-
-                if (!mod->skip)
-                        add_marker(mod, marker, fmt);
-        }
-        release_file(file, size);
-        return;
-fail:
-        fatal("parse error in markers list file\n");
-}
-
-static int compare_strings(const void *a, const void *b)
-{
-        return strcmp(*(const char **) a, *(const char **) b);
-}
-
-static void write_markers(const char *fname)
-{
-        struct buffer buf = { };
-        struct module *mod;
-        size_t i;
-
-        for (mod = modules; mod; mod = mod->next)
-                if ((!external_module || !mod->skip) && mod->markers != NULL) {
-                        /*
-                         * Sort the strings so we can skip duplicates when
-                         * we write them out.
-                         */
-                        qsort(mod->markers, mod->nmarkers,
-                              sizeof mod->markers[0], &compare_strings);
-                        for (i = 0; i < mod->nmarkers; ++i) {
-                                char *line = mod->markers[i];
-                                buf_write(&buf, line, strlen(line));
-                                while (i + 1 < mod->nmarkers &&
-                                       !strcmp(mod->markers[i],
-                                               mod->markers[i + 1]))
-                                        free(mod->markers[i++]);
-                                free(mod->markers[i]);
-                        }
-                        free(mod->markers);
-                        mod->markers = NULL;
-                }
-
-        write_if_changed(&buf, fname);
-}
-
 struct ext_sym_list {
         struct ext_sym_list *next;
         const char *file;
@@ -2077,8 +1936,6 @@ int main(int argc, char **argv)
         struct buffer buf = { };
         char *kernel_read = NULL, *module_read = NULL;
         char *dump_write = NULL;
-        char *markers_read = NULL;
-        char *markers_write = NULL;
         int opt;
         int err;
         struct ext_sym_list *extsym_iter;
@@ -2122,12 +1979,6 @@ int main(int argc, char **argv)
                 case 'w':
                         warn_unresolved = 1;
                         break;
-                        case 'M':
-                                markers_write = optarg;
-                                break;
-                        case 'K':
-                                markers_read = optarg;
-                                break;
                 default:
                         exit(1);
                 }
@@ -2182,11 +2033,5 @@ int main(int argc, char **argv)
                      "'make CONFIG_DEBUG_SECTION_MISMATCH=y'\n",
                      sec_mismatch_count);
 
-        if (markers_read)
-                read_markers(markers_read);
-
-        if (markers_write)
-                write_markers(markers_write);
-
         return err;
 }
diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h
index 09f58e33d227..be987a44f250 100644
--- a/scripts/mod/modpost.h
+++ b/scripts/mod/modpost.h
@@ -112,8 +112,6 @@ struct module {
         int has_init;
         int has_cleanup;
         struct buffer dev_table_buf;
-        char **markers;
-        size_t nmarkers;
         char         srcversion[25];
 };
 
@@ -128,7 +126,6 @@ struct elf_info {
         Elf_Section  export_gpl_sec;
         Elf_Section  export_unused_gpl_sec;
         Elf_Section  export_gpl_future_sec;
-        Elf_Section  markers_strings_sec;
         const char   *strtab;
         char         *modinfo;
         unsigned int modinfo_len;
diff --git a/scripts/package/Makefile b/scripts/package/Makefile
index f67cc885c807..62fcc3a7f4d3 100644
--- a/scripts/package/Makefile
+++ b/scripts/package/Makefile
@@ -77,9 +77,27 @@ clean-files += $(objtree)/binkernel.spec
 
 # Deb target
 # ---------------------------------------------------------------------------
+quiet_cmd_builddeb = BUILDDEB
+      cmd_builddeb = set -e; \
+        test `id -u` = 0 || \
+        test -n "$(KBUILD_PKG_ROOTCMD)" || { \
+                which fakeroot >/dev/null 2>&1 && \
+                KBUILD_PKG_ROOTCMD="fakeroot -u"; \
+        } || { \
+                echo; \
+                echo "builddeb must be run as root (or using fakeroot)."; \
+                echo "KBUILD_PKG_ROOTCMD is unset and fakeroot not found."; \
+                echo "Try setting KBUILD_PKG_ROOTCMD to a command to acquire"; \
+                echo "root privileges (e.g., 'fakeroot -u' or 'sudo')."; \
+                false; \
+        } && \
+        \
+        $$KBUILD_PKG_ROOTCMD $(CONFIG_SHELL) \
+                $(srctree)/scripts/package/builddeb
+
 deb-pkg: FORCE
         $(MAKE) KBUILD_SRC=
-        $(CONFIG_SHELL) $(srctree)/scripts/package/builddeb
+        $(call cmd,builddeb)
 
 clean-dirs += $(objtree)/debian/
 
diff --git a/scripts/package/buildtar b/scripts/package/buildtar
index b1fd48db1640..51b2aa0acb82 100644
--- a/scripts/package/buildtar
+++ b/scripts/package/buildtar
@@ -101,7 +101,11 @@ esac
 #
 (
         cd "${tmpdir}"
-        tar cf - . | ${compress} > "${tarball}${file_ext}"
+        opts=
+        if tar --owner=root --group=root --help >/dev/null 2>&1; then
+                opts="--owner=root --group=root"
+        fi
+        tar cf - . $opts | ${compress} > "${tarball}${file_ext}"
 )
 
 echo "Tarball successfully created in ${tarball}${file_ext}"
diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl
index 9cf0a6fad6ba..ea6f6e3adaea 100755
--- a/scripts/recordmcount.pl
+++ b/scripts/recordmcount.pl
@@ -113,13 +113,13 @@ $P =~ s@.*/@@g;
 
 my $V = '0.1';
 
-if ($#ARGV != 10) {
-        print "usage: $P arch bits objdump objcopy cc ld nm rm mv is_module inputfile\n";
+if ($#ARGV != 11) {
+        print "usage: $P arch endian bits objdump objcopy cc ld nm rm mv is_module inputfile\n";
         print "version: $V\n";
         exit(1);
 }
 
-my ($arch, $bits, $objdump, $objcopy, $cc,
+my ($arch, $endian, $bits, $objdump, $objcopy, $cc,
     $ld, $nm, $rm, $mv, $is_module, $inputfile) = @ARGV;
 
 # This file refers to mcount and shouldn't be ftraced, so lets' ignore it
@@ -194,7 +194,7 @@ sub check_objcopy
     }
 }
 
-if ($arch eq "x86") {
+if ($arch =~ /(x86(_64)?)|(i386)/) {
     if ($bits == 64) {
         $arch = "x86_64";
     } else {
@@ -295,6 +295,58 @@ if ($arch eq "x86_64") {
     $ld .= " -m elf64_sparc";
     $cc .= " -m64";
     $objcopy .= " -O elf64-sparc";
+} elsif ($arch eq "mips") {
+    # To enable module support, we need to enable the -mlong-calls option
+    # of gcc for module, after using this option, we can not get the real
+    # offset of the calling to _mcount, but the offset of the lui
+    # instruction or the addiu one. herein, we record the address of the
+    # first one, and then we can replace this instruction by a branch
+    # instruction to jump over the profiling function to filter the
+    # indicated functions, or swith back to the lui instruction to trace
+    # them, which means dynamic tracing.
+    #
+    #       c:  3c030000        lui     v1,0x0
+    #                   c: R_MIPS_HI16  _mcount
+    #                   c: R_MIPS_NONE  *ABS*
+    #                   c: R_MIPS_NONE  *ABS*
+    #      10:  64630000        daddiu  v1,v1,0
+    #                   10: R_MIPS_LO16 _mcount
+    #                   10: R_MIPS_NONE *ABS*
+    #                   10: R_MIPS_NONE *ABS*
+    #      14:  03e0082d        move    at,ra
+    #      18:  0060f809        jalr    v1
+    #
+    # for the kernel:
+    #
+    #     10:   03e0082d        move    at,ra
+    #     14:   0c000000        jal     0 <loongson_halt>
+    #                    14: R_MIPS_26   _mcount
+    #                    14: R_MIPS_NONE *ABS*
+    #                    14: R_MIPS_NONE *ABS*
+    #    18:   00020021        nop
+    if ($is_module eq "0") {
+            $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s_mcount\$";
+    } else {
+            $mcount_regex = "^\\s*([0-9a-fA-F]+): R_MIPS_HI16\\s+_mcount\$";
+    }
+    $objdump .= " -Melf-trad".$endian."mips ";
+
+    if ($endian eq "big") {
+            $endian = " -EB ";
+            $ld .= " -melf".$bits."btsmip";
+    } else {
+            $endian = " -EL ";
+            $ld .= " -melf".$bits."ltsmip";
+    }
+
+    $cc .= " -mno-abicalls -fno-pic -mabi=" . $bits . $endian;
+    $ld .= $endian;
+
+    if ($bits == 64) {
+            $function_regex =
+                "^([0-9a-fA-F]+)\\s+<(.|[^\$]L.*?|\$[^L].*?|[^\$][^L].*?)>:";
+            $type = ".dword";
+    }
 } elsif ($arch eq "microblaze") {
     # Microblaze calls '_mcount' instead of plain 'mcount'.
     $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s_mcount\$";
diff --git a/scripts/tags.sh b/scripts/tags.sh
index d52f7a01557c..1a0c44d7c4a7 100755
--- a/scripts/tags.sh
+++ b/scripts/tags.sh
@@ -89,7 +89,13 @@ all_defconfigs()
 
 docscope()
 {
-        (echo \-k; echo \-q; all_sources) > cscope.files
+        # always use absolute paths for cscope, as recommended by cscope
+        # upstream
+        case "$tree" in
+                /*) ;;
+                *) tree=$PWD/$tree ;;
+        esac
+        (cd /; echo \-k; echo \-q; all_sources) > cscope.files
         cscope -b -f cscope.out
 }
 
diff --git a/scripts/unifdef.c b/scripts/unifdef.c
index 30d459fb0709..44d39785e50d 100644
--- a/scripts/unifdef.c
+++ b/scripts/unifdef.c
@@ -1,13 +1,5 @@
 /*
- * Copyright (c) 2002 - 2005 Tony Finch <dot@dotat.at>.  All rights reserved.
- *
- * This code is derived from software contributed to Berkeley by Dave Yost.
- * It was rewritten to support ANSI C by Tony Finch. The original version of
- * unifdef carried the following copyright notice. None of its code remains
- * in this version (though some of the names remain).
- *
- * Copyright (c) 1985, 1993
- *      The Regents of the University of California.  All rights reserved.
+ * Copyright (c) 2002 - 2009 Tony Finch <dot@dotat.at>
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -31,23 +23,20 @@
  * SUCH DAMAGE.
  */
 
-#include <sys/cdefs.h>
+/*
+ * This code was derived from software contributed to Berkeley by Dave Yost.
+ * It was rewritten to support ANSI C by Tony Finch. The original version
+ * of unifdef carried the 4-clause BSD copyright licence. None of its code
+ * remains in this version (though some of the names remain) so it now
+ * carries a more liberal licence.
+ *
+ * The latest version is available from http://dotat.at/prog/unifdef
+ */
 
-#ifndef lint
-#if 0
-static const char copyright[] =
-"@(#) Copyright (c) 1985, 1993\n\
-        The Regents of the University of California.  All rights reserved.\n";
-#endif
-#ifdef __IDSTRING
-__IDSTRING(Berkeley, "@(#)unifdef.c     8.1 (Berkeley) 6/6/93");
-__IDSTRING(NetBSD, "$NetBSD: unifdef.c,v 1.8 2000/07/03 02:51:36 matt Exp $");
-__IDSTRING(dotat, "$dotat: things/unifdef.c,v 1.171 2005/03/08 12:38:48 fanf2 Exp $");
-#endif
-#endif /* not lint */
-#ifdef __FBSDID
-__FBSDID("$FreeBSD: /repoman/r/ncvs/src/usr.bin/unifdef/unifdef.c,v 1.20 2005/05/21 09:55:09 ru Exp $");
-#endif
+static const char * const copyright[] = {
+    "@(#) Copyright (c) 2002 - 2009 Tony Finch <dot@dotat.at>\n",
+    "$dotat: unifdef/unifdef.c,v 1.190 2009/11/27 17:21:26 fanf2 Exp $",
+};
 
 /*
  * unifdef - remove ifdef'ed lines
@@ -72,8 +61,6 @@ __FBSDID("$FreeBSD: /repoman/r/ncvs/src/usr.bin/unifdef/unifdef.c,v 1.20 2005/05
 #include <string.h>
 #include <unistd.h>
 
-size_t strlcpy(char *dst, const char *src, size_t siz);
-
 /* types of input lines: */
 typedef enum {
         LT_TRUEI,               /* a true #if with ignore flag */
@@ -90,6 +77,7 @@ typedef enum {
         LT_DODGY_LAST = LT_DODGY + LT_ENDIF,
         LT_PLAIN,               /* ordinary line */
         LT_EOF,                 /* end of file */
+        LT_ERROR,               /* unevaluable #if */
         LT_COUNT
 } Linetype;
 
@@ -100,7 +88,7 @@ static char const * const linetype_name[] = {
         "DODGY IF", "DODGY TRUE", "DODGY FALSE",
         "DODGY ELIF", "DODGY ELTRUE", "DODGY ELFALSE",
         "DODGY ELSE", "DODGY ENDIF",
-        "PLAIN", "EOF"
+        "PLAIN", "EOF", "ERROR"
 };
 
 /* state of #if processing */
@@ -168,11 +156,13 @@ static char const * const linestate_name[] = {
  * Globals.
  */
 
+static bool             compblank;              /* -B: compress blank lines */
+static bool             lnblank;                /* -b: blank deleted lines */
 static bool             complement;             /* -c: do the complement */
 static bool             debugging;              /* -d: debugging reports */
 static bool             iocccok;                /* -e: fewer IOCCC errors */
+static bool             strictlogic;            /* -K: keep ambiguous #ifs */
 static bool             killconsts;             /* -k: eval constant #ifs */
-static bool             lnblank;                /* -l: blank deleted lines */
 static bool             lnnum;                  /* -n: add #line directives */
 static bool             symlist;                /* -s: output symbol list */
 static bool             text;                   /* -t: this is a text file */
@@ -196,7 +186,9 @@ static bool             ignoring[MAXDEPTH];	/* ignore comments state */
 static int              stifline[MAXDEPTH];     /* start of current #if */
 static int              depth;                  /* current #if nesting */
 static int              delcount;               /* count of deleted lines */
-static bool             keepthis;               /* don't delete constant #if */
+static unsigned         blankcount;             /* count of blank lines */
+static unsigned         blankmax;               /* maximum recent blankcount */
+static bool             constexpr;              /* constant #if expression */
 
 static int              exitstat;               /* program exit status */
 
@@ -206,13 +198,14 @@ static void             done(void);
 static void             error(const char *);
 static int              findsym(const char *);
 static void             flushline(bool);
-static Linetype         get_line(void);
+static Linetype         parseline(void);
 static Linetype         ifeval(const char **);
 static void             ignoreoff(void);
 static void             ignoreon(void);
 static void             keywordedit(const char *);
 static void             nest(void);
 static void             process(void);
+static const char      *skipargs(const char *);
 static const char      *skipcomment(const char *);
 static const char      *skipsym(const char *);
 static void             state(Ifstate);
@@ -220,7 +213,7 @@ static int              strlcmp(const char *, const char *, size_t);
 static void             unnest(void);
 static void             usage(void);
 
-#define endsym(c) (!isalpha((unsigned char)c) && !isdigit((unsigned char)c) && c != '_')
+#define endsym(c) (!isalnum((unsigned char)c) && c != '_')
 
 /*
  * The main program.
@@ -230,7 +223,7 @@ main(int argc, char *argv[])
 {
         int opt;
 
-        while ((opt = getopt(argc, argv, "i:D:U:I:cdeklnst")) != -1)
+        while ((opt = getopt(argc, argv, "i:D:U:I:BbcdeKklnst")) != -1)
                 switch (opt) {
                 case 'i': /* treat stuff controlled by these symbols as text */
                         /*
@@ -255,6 +248,13 @@ main(int argc, char *argv[])
                 case 'I':
                         /* no-op for compatibility with cpp */
                         break;
+                case 'B': /* compress blank lines around removed section */
+                        compblank = true;
+                        break;
+                case 'b': /* blank deleted lines instead of omitting them */
+                case 'l': /* backwards compatibility */
+                        lnblank = true;
+                        break;
                 case 'c': /* treat -D as -U and vice versa */
                         complement = true;
                         break;
@@ -264,12 +264,12 @@ main(int argc, char *argv[])
                 case 'e': /* fewer errors from dodgy lines */
                         iocccok = true;
                         break;
+                case 'K': /* keep ambiguous #ifs */
+                        strictlogic = true;
+                        break;
                 case 'k': /* process constant #ifs */
                         killconsts = true;
                         break;
-                case 'l': /* blank deleted lines instead of omitting them */
-                        lnblank = true;
-                        break;
                 case 'n': /* add #line directive after deleted lines */
                         lnnum = true;
                         break;
@@ -284,6 +284,8 @@ main(int argc, char *argv[])
                 }
         argc -= optind;
         argv += optind;
+        if (compblank && lnblank)
+                errx(2, "-B and -b are mutually exclusive");
         if (argc > 1) {
                 errx(2, "can only do one file");
         } else if (argc == 1 && strcmp(*argv, "-") != 0) {
@@ -302,7 +304,7 @@ main(int argc, char *argv[])
 static void
 usage(void)
 {
-        fprintf(stderr, "usage: unifdef [-cdeklnst] [-Ipath]"
+        fprintf(stderr, "usage: unifdef [-BbcdeKknst] [-Ipath]"
             " [-Dsym[=val]] [-Usym] [-iDsym[=val]] [-iUsym] ... [file]\n");
         exit(2);
 }
@@ -383,46 +385,46 @@ static state_fn * const trans_table[IS_COUNT][LT_COUNT] = {
 /* IS_OUTSIDE */
 { Itrue, Ifalse,Fpass, Ftrue, Ffalse,Eelif, Eelif, Eelif, Eelse, Eendif,
   Oiffy, Oiffy, Fpass, Oif,   Oif,   Eelif, Eelif, Eelif, Eelse, Eendif,
-  print, done },
+  print, done,  abort },
 /* IS_FALSE_PREFIX */
 { Idrop, Idrop, Fdrop, Fdrop, Fdrop, Mpass, Strue, Sfalse,Selse, Dendif,
   Idrop, Idrop, Fdrop, Fdrop, Fdrop, Mpass, Eioccc,Eioccc,Eioccc,Eioccc,
-  drop,  Eeof },
+  drop,  Eeof,  abort },
 /* IS_TRUE_PREFIX */
 { Itrue, Ifalse,Fpass, Ftrue, Ffalse,Dfalse,Dfalse,Dfalse,Delse, Dendif,
   Oiffy, Oiffy, Fpass, Oif,   Oif,   Eioccc,Eioccc,Eioccc,Eioccc,Eioccc,
-  print, Eeof },
+  print, Eeof,  abort },
 /* IS_PASS_MIDDLE */
 { Itrue, Ifalse,Fpass, Ftrue, Ffalse,Pelif, Mtrue, Delif, Pelse, Pendif,
   Oiffy, Oiffy, Fpass, Oif,   Oif,   Pelif, Oelif, Oelif, Pelse, Pendif,
-  print, Eeof },
+  print, Eeof,  abort },
 /* IS_FALSE_MIDDLE */
 { Idrop, Idrop, Fdrop, Fdrop, Fdrop, Pelif, Mtrue, Delif, Pelse, Pendif,
   Idrop, Idrop, Fdrop, Fdrop, Fdrop, Eioccc,Eioccc,Eioccc,Eioccc,Eioccc,
-  drop,  Eeof },
+  drop,  Eeof,  abort },
 /* IS_TRUE_MIDDLE */
 { Itrue, Ifalse,Fpass, Ftrue, Ffalse,Melif, Melif, Melif, Melse, Pendif,
   Oiffy, Oiffy, Fpass, Oif,   Oif,   Eioccc,Eioccc,Eioccc,Eioccc,Pendif,
-  print, Eeof },
+  print, Eeof,  abort },
 /* IS_PASS_ELSE */
 { Itrue, Ifalse,Fpass, Ftrue, Ffalse,Eelif, Eelif, Eelif, Eelse, Pendif,
   Oiffy, Oiffy, Fpass, Oif,   Oif,   Eelif, Eelif, Eelif, Eelse, Pendif,
-  print, Eeof },
+  print, Eeof,  abort },
 /* IS_FALSE_ELSE */
 { Idrop, Idrop, Fdrop, Fdrop, Fdrop, Eelif, Eelif, Eelif, Eelse, Dendif,
   Idrop, Idrop, Fdrop, Fdrop, Fdrop, Eelif, Eelif, Eelif, Eelse, Eioccc,
-  drop,  Eeof },
+  drop,  Eeof,  abort },
 /* IS_TRUE_ELSE */
 { Itrue, Ifalse,Fpass, Ftrue, Ffalse,Eelif, Eelif, Eelif, Eelse, Dendif,
   Oiffy, Oiffy, Fpass, Oif,   Oif,   Eelif, Eelif, Eelif, Eelse, Eioccc,
-  print, Eeof },
+  print, Eeof,  abort },
 /* IS_FALSE_TRAILER */
 { Idrop, Idrop, Fdrop, Fdrop, Fdrop, Dfalse,Dfalse,Dfalse,Delse, Dendif,
   Idrop, Idrop, Fdrop, Fdrop, Fdrop, Dfalse,Dfalse,Dfalse,Delse, Eioccc,
-  drop,  Eeof }
+  drop,  Eeof,  abort }
 /*TRUEI  FALSEI IF     TRUE   FALSE  ELIF   ELTRUE ELFALSE ELSE  ENDIF
   TRUEI  FALSEI IF     TRUE   FALSE  ELIF   ELTRUE ELFALSE ELSE  ENDIF (DODGY)
-  PLAIN  EOF */
+  PLAIN  EOF    ERROR */
 };
 
 /*
@@ -463,9 +465,11 @@ keywordedit(const char *replacement)
 static void
 nest(void)
 {
-        depth += 1;
-        if (depth >= MAXDEPTH)
+        if (depth > MAXDEPTH-1)
+                abort(); /* bug */
+        if (depth == MAXDEPTH-1)
                 error("Too many levels of nesting");
+        depth += 1;
         stifline[depth] = linenum;
 }
 static void
@@ -490,15 +494,23 @@ flushline(bool keep)
         if (symlist)
                 return;
         if (keep ^ complement) {
-                if (lnnum && delcount > 0)
-                        printf("#line %d\n", linenum);
-                fputs(tline, stdout);
-                delcount = 0;
+                bool blankline = tline[strspn(tline, " \t\n")] == '\0';
+                if (blankline && compblank && blankcount != blankmax) {
+                        delcount += 1;
+                        blankcount += 1;
+                } else {
+                        if (lnnum && delcount > 0)
+                                printf("#line %d\n", linenum);
+                        fputs(tline, stdout);
+                        delcount = 0;
+                        blankmax = blankcount = blankline ? blankcount + 1 : 0;
+                }
         } else {
                 if (lnblank)
                         putc('\n', stdout);
                 exitstat = 1;
                 delcount += 1;
+                blankcount = 0;
         }
 }
 
@@ -510,9 +522,12 @@ process(void)
 {
         Linetype lineval;
 
+        /* When compressing blank lines, act as if the file
+           is preceded by a large number of blank lines. */
+        blankmax = blankcount = 1000;
         for (;;) {
                 linenum++;
-                lineval = get_line();
+                lineval = parseline();
                 trans_table[ifstate[depth]][lineval]();
                 debug("process %s -> %s depth %d",
                     linetype_name[lineval],
@@ -526,7 +541,7 @@ process(void)
  * help from skipcomment().
  */
 static Linetype
-get_line(void)
+parseline(void)
 {
         const char *cp;
         int cursym;
@@ -595,9 +610,21 @@ get_line(void)
                         if (incomment)
                                 linestate = LS_DIRTY;
                 }
-                /* skipcomment should have changed the state */
-                if (linestate == LS_HASH)
-                        abort(); /* bug */
+                /* skipcomment normally changes the state, except
+                   if the last line of the file lacks a newline, or
+                   if there is too much whitespace in a directive */
+                if (linestate == LS_HASH) {
+                        size_t len = cp - tline;
+                        if (fgets(tline + len, MAXLINE - len, input) == NULL) {
+                                /* append the missing newline */
+                                tline[len+0] = '\n';
+                                tline[len+1] = '\0';
+                                cp++;
+                                linestate = LS_START;
+                        } else {
+                                linestate = LS_DIRTY;
+                        }
+                }
         }
         if (linestate == LS_DIRTY) {
                 while (*cp != '\0')
@@ -610,17 +637,40 @@ get_line(void)
 
 /*
  * These are the binary operators that are supported by the expression
- * evaluator. Note that if support for division is added then we also
- * need short-circuiting booleans because of divide-by-zero.
+ * evaluator.
  */
-static int op_lt(int a, int b) { return (a < b); }
-static int op_gt(int a, int b) { return (a > b); }
-static int op_le(int a, int b) { return (a <= b); }
-static int op_ge(int a, int b) { return (a >= b); }
-static int op_eq(int a, int b) { return (a == b); }
-static int op_ne(int a, int b) { return (a != b); }
-static int op_or(int a, int b) { return (a || b); }
-static int op_and(int a, int b) { return (a && b); }
+static Linetype op_strict(int *p, int v, Linetype at, Linetype bt) {
+        if(at == LT_IF || bt == LT_IF) return (LT_IF);
+        return (*p = v, v ? LT_TRUE : LT_FALSE);
+}
+static Linetype op_lt(int *p, Linetype at, int a, Linetype bt, int b) {
+        return op_strict(p, a < b, at, bt);
+}
+static Linetype op_gt(int *p, Linetype at, int a, Linetype bt, int b) {
+        return op_strict(p, a > b, at, bt);
+}
+static Linetype op_le(int *p, Linetype at, int a, Linetype bt, int b) {
+        return op_strict(p, a <= b, at, bt);
+}
+static Linetype op_ge(int *p, Linetype at, int a, Linetype bt, int b) {
+        return op_strict(p, a >= b, at, bt);
+}
+static Linetype op_eq(int *p, Linetype at, int a, Linetype bt, int b) {
+        return op_strict(p, a == b, at, bt);
+}
+static Linetype op_ne(int *p, Linetype at, int a, Linetype bt, int b) {
+        return op_strict(p, a != b, at, bt);
+}
+static Linetype op_or(int *p, Linetype at, int a, Linetype bt, int b) {
+        if (!strictlogic && (at == LT_TRUE || bt == LT_TRUE))
+                return (*p = 1, LT_TRUE);
+        return op_strict(p, a || b, at, bt);
+}
+static Linetype op_and(int *p, Linetype at, int a, Linetype bt, int b) {
+        if (!strictlogic && (at == LT_FALSE || bt == LT_FALSE))
+                return (*p = 0, LT_FALSE);
+        return op_strict(p, a && b, at, bt);
+}
 
 /*
  * An evaluation function takes three arguments, as follows: (1) a pointer to
@@ -629,8 +679,8 @@ static int op_and(int a, int b) { return (a && b); }
  * value of the expression; and (3) a pointer to a char* that points to the
  * expression to be evaluated and that is updated to the end of the expression
  * when evaluation is complete. The function returns LT_FALSE if the value of
- * the expression is zero, LT_TRUE if it is non-zero, or LT_IF if the
- * expression could not be evaluated.
+ * the expression is zero, LT_TRUE if it is non-zero, LT_IF if the expression
+ * depends on an unknown symbol, or LT_ERROR if there is a parse failure.
  */
 struct ops;
 
@@ -649,7 +699,7 @@ static const struct ops {
         eval_fn *inner;
         struct op {
                 const char *str;
-                int (*fn)(int, int);
+                Linetype (*fn)(int *, Linetype, int, Linetype, int);
         } op[5];
 } eval_ops[] = {
         { eval_table, { { "||", op_or } } },
@@ -664,8 +714,8 @@ static const struct ops {
 
 /*
  * Function for evaluating the innermost parts of expressions,
- * viz. !expr (expr) defined(symbol) symbol number
- * We reset the keepthis flag when we find a non-constant subexpression.
+ * viz. !expr (expr) number defined(symbol) symbol
+ * We reset the constexpr flag in the last two cases.
  */
 static Linetype
 eval_unary(const struct ops *ops, int *valp, const char **cpp)
@@ -673,68 +723,83 @@ eval_unary(const struct ops *ops, int *valp, const char **cpp)
         const char *cp;
         char *ep;
         int sym;
+        bool defparen;
+        Linetype lt;
 
         cp = skipcomment(*cpp);
         if (*cp == '!') {
                 debug("eval%d !", ops - eval_ops);
                 cp++;
-                if (eval_unary(ops, valp, &cp) == LT_IF) {
-                        *cpp = cp;
-                        return (LT_IF);
+                lt = eval_unary(ops, valp, &cp);
+                if (lt == LT_ERROR)
+                        return (LT_ERROR);
+                if (lt != LT_IF) {
+                        *valp = !*valp;
+                        lt = *valp ? LT_TRUE : LT_FALSE;
                 }
-                *valp = !*valp;
         } else if (*cp == '(') {
                 cp++;
                 debug("eval%d (", ops - eval_ops);
-                if (eval_table(eval_ops, valp, &cp) == LT_IF)
-                        return (LT_IF);
+                lt = eval_table(eval_ops, valp, &cp);
+                if (lt == LT_ERROR)
+                        return (LT_ERROR);
                 cp = skipcomment(cp);
                 if (*cp++ != ')')
-                        return (LT_IF);
+                        return (LT_ERROR);
         } else if (isdigit((unsigned char)*cp)) {
                 debug("eval%d number", ops - eval_ops);
                 *valp = strtol(cp, &ep, 0);
+                if (ep == cp)
+                        return (LT_ERROR);
+                lt = *valp ? LT_TRUE : LT_FALSE;
                 cp = skipsym(cp);
         } else if (strncmp(cp, "defined", 7) == 0 && endsym(cp[7])) {
                 cp = skipcomment(cp+7);
                 debug("eval%d defined", ops - eval_ops);
-                if (*cp++ != '(')
-                        return (LT_IF);
-                cp = skipcomment(cp);
+                if (*cp == '(') {
+                        cp = skipcomment(cp+1);
+                        defparen = true;
+                } else {
+                        defparen = false;
+                }
                 sym = findsym(cp);
-                cp = skipsym(cp);
-                cp = skipcomment(cp);
-                if (*cp++ != ')')
-                        return (LT_IF);
-                if (sym >= 0)
+                if (sym < 0) {
+                        lt = LT_IF;
+                } else {
                         *valp = (value[sym] != NULL);
-                else {
-                        *cpp = cp;
-                        return (LT_IF);
+                        lt = *valp ? LT_TRUE : LT_FALSE;
                 }
-                keepthis = false;
+                cp = skipsym(cp);
+                cp = skipcomment(cp);
+                if (defparen && *cp++ != ')')
+                        return (LT_ERROR);
+                constexpr = false;
         } else if (!endsym(*cp)) {
                 debug("eval%d symbol", ops - eval_ops);
                 sym = findsym(cp);
-                if (sym < 0)
-                        return (LT_IF);
-                if (value[sym] == NULL)
+                cp = skipsym(cp);
+                if (sym < 0) {
+                        lt = LT_IF;
+                        cp = skipargs(cp);
+                } else if (value[sym] == NULL) {
                         *valp = 0;
-                else {
+                        lt = LT_FALSE;
+                } else {
                         *valp = strtol(value[sym], &ep, 0);
                         if (*ep != '\0' || ep == value[sym])
-                                return (LT_IF);
+                                return (LT_ERROR);
+                        lt = *valp ? LT_TRUE : LT_FALSE;
+                        cp = skipargs(cp);
                 }
-                cp = skipsym(cp);
-                keepthis = false;
+                constexpr = false;
         } else {
                 debug("eval%d bad expr", ops - eval_ops);
-                return (LT_IF);
+                return (LT_ERROR);
         }
 
         *cpp = cp;
         debug("eval%d = %d", ops - eval_ops, *valp);
-        return (*valp ? LT_TRUE : LT_FALSE);
+        return (lt);
 }
 
 /*
@@ -746,11 +811,13 @@ eval_table(const struct ops *ops, int *valp, const char **cpp)
         const struct op *op;
         const char *cp;
         int val;
-        Linetype lhs, rhs;
+        Linetype lt, rt;
 
         debug("eval%d", ops - eval_ops);
         cp = *cpp;
-        lhs = ops->inner(ops+1, valp, &cp);
+        lt = ops->inner(ops+1, valp, &cp);
+        if (lt == LT_ERROR)
+                return (LT_ERROR);
         for (;;) {
                 cp = skipcomment(cp);
                 for (op = ops->op; op->str != NULL; op++)
@@ -760,32 +827,16 @@ eval_table(const struct ops *ops, int *valp, const char **cpp)
                         break;
                 cp += strlen(op->str);
                 debug("eval%d %s", ops - eval_ops, op->str);
-                rhs = ops->inner(ops+1, &val, &cp);
-                if (op->fn == op_and && (lhs == LT_FALSE || rhs == LT_FALSE)) {
-                        debug("eval%d: and always false", ops - eval_ops);
-                        if (lhs == LT_IF)
-                                *valp = val;
-                        lhs = LT_FALSE;
-                        continue;
-                }
-                if (op->fn == op_or && (lhs == LT_TRUE || rhs == LT_TRUE)) {
-                        debug("eval%d: or always true", ops - eval_ops);
-                        if (lhs == LT_IF)
-                                *valp = val;
-                        lhs = LT_TRUE;
-                        continue;
-                }
-                if (rhs == LT_IF)
-                        lhs = LT_IF;
-                if (lhs != LT_IF)
-                        *valp = op->fn(*valp, val);
+                rt = ops->inner(ops+1, &val, &cp);
+                if (rt == LT_ERROR)
+                        return (LT_ERROR);
+                lt = op->fn(valp, lt, *valp, rt, val);
         }
 
         *cpp = cp;
         debug("eval%d = %d", ops - eval_ops, *valp);
-        if (lhs != LT_IF)
-                lhs = (*valp ? LT_TRUE : LT_FALSE);
-        return lhs;
+        debug("eval%d lt = %s", ops - eval_ops, linetype_name[lt]);
+        return (lt);
 }
 
 /*
@@ -796,17 +847,14 @@ eval_table(const struct ops *ops, int *valp, const char **cpp)
 static Linetype
 ifeval(const char **cpp)
 {
-        const char *cp = *cpp;
         int ret;
-        int val;
+        int val = 0;
 
         debug("eval %s", *cpp);
-        keepthis = killconsts ? false : true;
-        ret = eval_table(eval_ops, &val, &cp);
-        if (ret != LT_IF)
-                *cpp = cp;
+        constexpr = killconsts ? false : true;
+        ret = eval_table(eval_ops, &val, cpp);
         debug("eval = %d", val);
-        return (keepthis ? LT_IF : ret);
+        return (constexpr ? LT_IF : ret == LT_ERROR ? LT_IF : ret);
 }
 
 /*
@@ -918,6 +966,31 @@ skipcomment(const char *cp)
 }
 
 /*
+ * Skip macro arguments.
+ */
+static const char *
+skipargs(const char *cp)
+{
+        const char *ocp = cp;
+        int level = 0;
+        cp = skipcomment(cp);
+        if (*cp != '(')
+                return (cp);
+        do {
+                if (*cp == '(')
+                        level++;
+                if (*cp == ')')
+                        level--;
+                cp = skipcomment(cp+1);
+        } while (level != 0 && *cp != '\0');
+        if (level == 0)
+                return (cp);
+        else
+        /* Rewind and re-detect the syntax error later. */
+                return (ocp);
+}
+
+/*
  * Skip over an identifier.
  */
 static const char *
@@ -929,7 +1002,7 @@ skipsym(const char *cp)
 }
 
 /*
- * Look for the symbol in the symbol table. If is is found, we return
+ * Look for the symbol in the symbol table. If it is found, we return
  * the symbol table index, else we return -1.
  */
 static int