47 files changed, 1654 insertions, 687 deletions
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index e4deb73e9a84..a1a5cf95a68d 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -115,7 +115,10 @@ endif
 # ---------------------------------------------------------------------------
 # Default is built-in, unless we know otherwise
-modkern_cflags = $(if $(part-of-module), $(CFLAGS_MODULE), $(CFLAGS_KERNEL))
+modkern_cflags =                                          \
+        $(if $(part-of-module),                           \
+                $(KBUILD_CFLAGS_MODULE) $(CFLAGS_MODULE), \
+                $(KBUILD_CFLAGS_KERNEL) $(CFLAGS_KERNEL))
 quiet_modtag := $(empty)   $(empty)
 $(real-objs-m)        : part-of-module := y
@@ -156,14 +159,14 @@ $(obj)/%.i: $(src)/%.c FORCE
 cmd_gensymtypes =                                                           \
    $(CPP) -D__GENKSYMS__ $(c_flags) $< |                                   \
-    $(GENKSYMS) -T $@ -a $(ARCH)                                            \
+    $(GENKSYMS) $(if $(1), -T $(2)) -a $(ARCH)                              \
     $(if $(KBUILD_PRESERVE),-p)                                            \
-     $(if $(1),-r $(firstword $(wildcard $(@:.symtypes=.symref) /dev/null)))
+     -r $(firstword $(wildcard $(2:.symtypes=.symref) /dev/null))
 quiet_cmd_cc_symtypes_c = SYM $(quiet_modtag) $@
 cmd_cc_symtypes_c =                                                         \
    set -e;                                                                 \
-    $(call cmd_gensymtypes, true) >/dev/null;                               \
+    $(call cmd_gensymtypes,true,$@) >/dev/null;                             \
    test -s $@ || rm -f $@
 $(obj)/%.symtypes : $(src)/%.c FORCE
@@ -192,16 +195,16 @@ else
 #   the actual value of the checksum generated by genksyms
 cmd_cc_o_c = $(CC) $(c_flags) -c -o $(@D)/.tmp_$(@F) $<
-cmd_modversions =                                                       \
+cmd_modversions =                                                               \
-        if $(OBJDUMP) -h $(@D)/.tmp_$(@F) | grep -q __ksymtab; then     \
+        if $(OBJDUMP) -h $(@D)/.tmp_$(@F) | grep -q __ksymtab; then             \
-                $(call cmd_gensymtypes, $(KBUILD_SYMTYPES))             \
+                $(call cmd_gensymtypes,$(KBUILD_SYMTYPES),$(@:.o=.symtypes))    \
-                    > $(@D)/.tmp_$(@F:.o=.ver);                         \
+                    > $(@D)/.tmp_$(@F:.o=.ver);                                 \
-                                                                        \
+                                                                                \
-                $(LD) $(LDFLAGS) -r -o $@ $(@D)/.tmp_$(@F)              \
+                $(LD) $(LDFLAGS) -r -o $@ $(@D)/.tmp_$(@F)                      \
-                        -T $(@D)/.tmp_$(@F:.o=.ver);                    \
+                        -T $(@D)/.tmp_$(@F:.o=.ver);                            \
-                rm -f $(@D)/.tmp_$(@F) $(@D)/.tmp_$(@F:.o=.ver);        \
+                rm -f $(@D)/.tmp_$(@F) $(@D)/.tmp_$(@F:.o=.ver);                \
-        else                                                            \
+        else                                                                    \
-                mv -f $(@D)/.tmp_$(@F) $@;                              \
+                mv -f $(@D)/.tmp_$(@F) $@;                                      \
        fi;
 endif
@@ -248,10 +251,10 @@ $(obj)/%.lst: $(src)/%.c FORCE
 # Compile assembler sources (.S)
 # ---------------------------------------------------------------------------
-modkern_aflags := $(AFLAGS_KERNEL)
+modkern_aflags := $(KBUILD_AFLAGS_KERNEL) $(AFLAGS_KERNEL)
-$(real-objs-m)      : modkern_aflags := $(AFLAGS_MODULE)
+$(real-objs-m)      : modkern_aflags := $(KBUILD_AFLAGS_MODULE) $(AFLAGS_MODULE)
-$(real-objs-m:.o=.s): modkern_aflags := $(AFLAGS_MODULE)
+$(real-objs-m:.o=.s): modkern_aflags := $(KBUILD_AFLAGS_MODULE) $(AFLAGS_MODULE)
 quiet_cmd_as_s_S = CPP $(quiet_modtag) $@
 cmd_as_s_S       = $(CPP) $(a_flags)   -o $@ $< 
diff --git a/scripts/Makefile.headersinst b/scripts/Makefile.headersinst
index 0fcd83838771..f89cb87f5c01 100644
--- a/scripts/Makefile.headersinst
+++ b/scripts/Makefile.headersinst
@@ -3,7 +3,6 @@
 #
 # header-y  - list files to be installed. They are preprocessed
 #             to remove __KERNEL__ section of the file
-# unifdef-y - Same as header-y. Obsolete
 # objhdr-y  - Same as header-y but for generated files
 #
 # ==========================================================================
@@ -20,7 +19,7 @@ include scripts/Kbuild.include
 install       := $(INSTALL_HDR_PATH)/$(_dst)
-header-y      := $(sort $(header-y) $(unifdef-y))
+header-y      := $(sort $(header-y))
 subdirs       := $(patsubst %/,%,$(filter %/, $(header-y)))
 header-y      := $(filter-out %/, $(header-y))
diff --git a/scripts/Makefile.help b/scripts/Makefile.help
new file mode 100644
index 000000000000..d03608f5db04
--- /dev/null
+++ b/scripts/Makefile.help
@@ -0,0 +1,3 @@
+checker-help:
+        @echo  '  coccicheck      - Check with Coccinelle.'
diff --git a/scripts/Makefile.modpost b/scripts/Makefile.modpost
index 8f14c81abbc7..7d22056582c1 100644
--- a/scripts/Makefile.modpost
+++ b/scripts/Makefile.modpost
@@ -30,7 +30,7 @@
 #     - See include/linux/module.h for more details
 # Step 4 is solely used to allow module versioning in external modules,
-# where the CRC of each module is retrieved from the Module.symers file.
+# where the CRC of each module is retrieved from the Module.symvers file.
 # KBUILD_MODPOST_WARN can be set to avoid error out in case of undefined
 # symbols in the final module linking stage
@@ -107,7 +107,7 @@ $(modules:.ko=.mod.c): __modpost ;
 modname = $(notdir $(@:.mod.o=))
 quiet_cmd_cc_o_c = CC      $@
-      cmd_cc_o_c = $(CC) $(c_flags) $(CFLAGS_MODULE)    \
+      cmd_cc_o_c = $(CC) $(c_flags) $(KBUILD_CFLAGS_MODULE) $(CFLAGS_MODULE) \
                   -c -o $@ $<
 $(modules:.ko=.mod.o): %.mod.o: %.mod.c FORCE
@@ -117,8 +117,9 @@ targets += $(modules:.ko=.mod.o)
 # Step 6), final link of the modules
 quiet_cmd_ld_ko_o = LD [M]  $@
-      cmd_ld_ko_o = $(LD) -r $(LDFLAGS) $(LDFLAGS_MODULE) -o $@         \
+      cmd_ld_ko_o = $(LD) -r $(LDFLAGS)                                 \
-                          $(filter-out FORCE,$^)
+                             $(KBUILD_LDFLAGS_MODULE) $(LDFLAGS_MODULE) \
+                             -o $@ $(filter-out FORCE,$^)
 $(modules): %.ko :%.o %.mod.o FORCE
        $(call if_changed,ld_ko_o)
diff --git a/scripts/checkkconfigsymbols.sh b/scripts/checkkconfigsymbols.sh
index 46be3c5a62b7..2ca49bb31efc 100755
--- a/scripts/checkkconfigsymbols.sh
+++ b/scripts/checkkconfigsymbols.sh
@@ -14,7 +14,7 @@ find $paths -name '*.[chS]' -o -name 'Makefile' -o -name 'Makefile*[^~]'| while
 do
        # Output the bare Kconfig variable and the filename; the _MODULE part at
        # the end is not removed here (would need perl an not-hungry regexp for that).
-        sed -ne 's!^.*\<\(UML_\)\?CONFIG_\([0-9A-Z_]\+\).*!\2 '$i'!p' < $i
+        sed -ne 's!^.*\<\(UML_\)\?CONFIG_\([0-9A-Za-z_]\+\).*!\2 '$i'!p' < $i
 done | \
 # Smart "sort|uniq" implemented in awk and tuned to collect the names of all
 # files which use a given symbol
diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl
index bd88f11b0953..2039acdf5122 100755
--- a/scripts/checkpatch.pl
+++ b/scripts/checkpatch.pl
@@ -195,7 +195,7 @@ our $typeTypedefs = qr{(?x:
 our $logFunctions = qr{(?x:
        printk|
        pr_(debug|dbg|vdbg|devel|info|warning|err|notice|alert|crit|emerg|cont)|
-        dev_(printk|dbg|vdbg|info|warn|err|notice|alert|crit|emerg|WARN)|
+        (dev|netdev|netif)_(printk|dbg|vdbg|info|warn|err|notice|alert|crit|emerg|WARN)|
        WARN|
        panic
 )};
@@ -224,6 +224,12 @@ our @modifierList = (
        qr{fastcall},
 );
+our $allowed_asm_includes = qr{(?x:
+        irq|
+        memory
+)};
+# memory.h: ARM has a custom one
 sub build_types {
        my $mods = "(?x:  \n" . join("|\n  ", @modifierList) . "\n)";
        my $all = "(?x:  \n" . join("|\n  ", @typeList) . "\n)";
@@ -552,6 +558,9 @@ sub ctx_statement_block {
                        $type = ($level != 0)? '{' : '';
                        if ($level == 0) {
+                                if (substr($blk, $off + 1, 1) eq ';') {
+                                        $off++;
+                                }
                                last;
                        }
                }
@@ -1403,7 +1412,8 @@ sub process {
 #80 column limit
                if ($line =~ /^\+/ && $prevrawline !~ /\/\*\*/ &&
                    $rawline !~ /^.\s*\*\s*\@$Ident\s/ &&
-                    $line !~ /^\+\s*$logFunctions\s*\(\s*(?:KERN_\S+\s*)?"[X\t]*"\s*(?:,|\)\s*;)\s*$/ &&
+                    !($line =~ /^\+\s*$logFunctions\s*\(\s*(?:(KERN_\S+\s*|[^"]*))?"[X\t]*"\s*(?:,|\)\s*;)\s*$/ ||
+                    $line =~ /^\+\s*"[^"]*"\s*(?:\s*|,|\)\s*;)\s*$/) &&
                    $length > 80)
                {
                        WARN("line over 80 characters\n" . $herecurr);
@@ -1448,6 +1458,13 @@ sub process {
                        WARN("please, no space before tabs\n" . $herevet);
                }
+# check for spaces at the beginning of a line.
+                if ($rawline =~ /^\+ / && $rawline !~ /\+ +\*/)  {
+                        my $herevet = "$here\n" . cat_vet($rawline) . "\n";
+                        WARN("please, no space for starting a line, \
+                                excluding comments\n" . $herevet);
+                }
 # check we are in a valid C source file if not then ignore this hunk
                next if ($realfile !~ /\.(h|c)$/);
@@ -1778,9 +1795,9 @@ sub process {
                        WARN("EXPORT_SYMBOL(foo); should immediately follow its function/variable\n" . $herecurr);
                }
-# check for external initialisers.
+# check for global initialisers.
                if ($line =~ /^.$Type\s*$Ident\s*(?:\s+$Modifier)*\s*=\s*(0|NULL|false)\s*;/) {
-                        ERROR("do not initialise externals to 0 or NULL\n" .
+                        ERROR("do not initialise globals to 0 or NULL\n" .
                                $herecurr);
                }
 # check for static initialisers.
@@ -2308,7 +2325,7 @@ sub process {
                        my $checkfile = "include/linux/$file";
                        if (-f "$root/$checkfile" &&
                            $realfile ne $checkfile &&
-                            $1 ne 'irq')
+                            $1 !~ /$allowed_asm_includes/)
                        {
                                if ($realfile =~ m{^arch/}) {
                                        CHK("Consider using #include <linux/$file> instead of <asm/$file>\n" . $herecurr);
@@ -2570,6 +2587,21 @@ sub process {
                        }
                }
+# prefer usleep_range over udelay
+                if ($line =~ /\budelay\s*\(\s*(\w+)\s*\)/) {
+                        # ignore udelay's < 10, however
+                        if (! (($1 =~ /(\d+)/) && ($1 < 10)) ) {
+                                CHK("usleep_range is preferred over udelay; see Documentation/timers/timers-howto.txt\n" . $line);
+                        }
+                }
+# warn about unexpectedly long msleep's
+                if ($line =~ /\bmsleep\s*\((\d+)\);/) {
+                        if ($1 < 20) {
+                                WARN("msleep < 20ms can sleep for up to 20ms; see Documentation/timers/timers-howto.txt\n" . $line);
+                        }
+                }
 # warn about #ifdefs in C files
 #               if ($line =~ /^.\s*\#\s*if(|n)def/ && ($realfile =~ /\.c$/)) {
 #                       print "#ifdef in C files should be avoided\n";
diff --git a/scripts/checksyscalls.sh b/scripts/checksyscalls.sh
index 66ad375612f2..6bb42e72e0e5 100755
--- a/scripts/checksyscalls.sh
+++ b/scripts/checksyscalls.sh
@@ -183,7 +183,6 @@ cat << EOF
 #define __IGNORE_ustat          /* statfs */
 #define __IGNORE_utime          /* utimes */
 #define __IGNORE_vfork          /* clone */
-#define __IGNORE_wait4          /* waitid */
 /* sync_file_range had a stupid ABI. Allow sync_file_range2 instead */
 #ifdef __NR_sync_file_range2
diff --git a/scripts/coccicheck b/scripts/coccicheck
new file mode 100755
index 000000000000..b8bcf1f7bed7
--- /dev/null
+++ b/scripts/coccicheck
@@ -0,0 +1,80 @@
+#!/bin/sh
+SPATCH="`which ${SPATCH:=spatch}`"
+if [ "$C" = "1" -o "$C" = "2" ]; then
+    ONLINE=1
+# This requires Coccinelle >= 0.2.3
+#    FLAGS="-ignore_unknown_options -very_quiet"
+#    OPTIONS=$*
+# Workaround for Coccinelle < 0.2.3
+    FLAGS="-I $srctree/include -very_quiet"
+    shift $(( $# - 1 ))
+    OPTIONS=$1
+else
+    ONLINE=0
+    FLAGS="-very_quiet"
+fi
+if [ ! -x "$SPATCH" ]; then
+    echo 'spatch is part of the Coccinelle project and is available at http://coccinelle.lip6.fr/'
+    exit 1
+fi
+if [ "$MODE" = "" ] ; then
+    if [ "$ONLINE" = "0" ] ; then
+        echo 'You have not explicitly specify the mode to use. Fallback to "report".'
+        echo 'You can specify the mode with "make coccicheck MODE=<mode>"'
+        echo 'Available modes are: report, patch, context, org'
+    fi
+    MODE="report"
+fi
+if [ "$ONLINE" = "0" ] ; then
+    echo ''
+    echo 'Please check for false positives in the output before submitting a patch.'
+    echo 'When using "patch" mode, carefully review the patch before submitting it.'
+    echo ''
+fi
+coccinelle () {
+    COCCI="$1"
+    OPT=`grep "Option" $COCCI | cut -d':' -f2`
+#   The option '-parse_cocci' can be used to syntaxically check the SmPL files.
+#
+#    $SPATCH -D $MODE $FLAGS -parse_cocci $COCCI $OPT > /dev/null
+    if [ "$ONLINE" = "0" ] ; then
+        FILE=`echo $COCCI | sed "s|$srctree/||"`
+        echo "Processing `basename $COCCI` with option(s) \"$OPT\""
+        echo 'Message example to submit a patch:'
+        sed -e '/\/\/\//!d' -e 's|^///||' $COCCI
+        echo ' The semantic patch that makes this change is available'
+        echo " in $FILE."
+        echo ''
+        echo ' More information about semantic patching is available at'
+        echo ' http://coccinelle.lip6.fr/'
+        echo ''
+        $SPATCH -D $MODE $FLAGS -sp_file $COCCI $OPT -dir $srctree || exit 1
+    else
+        $SPATCH -D $MODE $FLAGS -sp_file $COCCI $OPT $OPTIONS || exit 1
+    fi
+}
+if [ "$COCCI" = "" ] ; then
+    for f in `find $srctree/scripts/coccinelle/ -name '*.cocci' -type f | sort`; do
+        coccinelle $f
+    done
+else
+    coccinelle $COCCI
+fi
diff --git a/scripts/coccinelle/alloc/drop_kmalloc_cast.cocci b/scripts/coccinelle/alloc/drop_kmalloc_cast.cocci
new file mode 100644
index 000000000000..7d4771d449c3
--- /dev/null
+++ b/scripts/coccinelle/alloc/drop_kmalloc_cast.cocci
@@ -0,0 +1,67 @@
+///
+/// Casting (void *) value returned by kmalloc is useless
+/// as mentioned in Documentation/CodingStyle, Chap 14.
+///
+// Confidence: High
+// Copyright: 2009,2010 Nicolas Palix, DIKU.  GPLv2.
+// URL: http://coccinelle.lip6.fr/
+// Options: -no_includes -include_headers
+//
+// Keywords: kmalloc, kzalloc, kcalloc
+// Version min: < 2.6.12 kmalloc
+// Version min: < 2.6.12 kcalloc
+// Version min:   2.6.14 kzalloc
+//
+virtual context
+virtual patch
+virtual org
+virtual report
+//----------------------------------------------------------
+//  For context mode
+//----------------------------------------------------------
+@depends on context@
+type T;
+@@
+* (T *)
+  \(kmalloc\|kzalloc\|kcalloc\)(...)
+//----------------------------------------------------------
+//  For patch mode
+//----------------------------------------------------------
+@depends on patch@
+type T;
+@@
+- (T *)
+  \(kmalloc\|kzalloc\|kcalloc\)(...)
+//----------------------------------------------------------
+//  For org and report mode
+//----------------------------------------------------------
+@r depends on org || report@
+type T;
+position p;
+@@
+ (T@p *)\(kmalloc\|kzalloc\|kcalloc\)(...)
+@script:python depends on org@
+p << r.p;
+t << r.T;
+@@
+coccilib.org.print_safe_todo(p[0], t)
+@script:python depends on report@
+p << r.p;
+t << r.T;
+@@
+msg="WARNING: casting value returned by k[cmz]alloc to (%s *) is useless." % (t)
+coccilib.report.print_report(p[0], msg)
diff --git a/scripts/coccinelle/alloc/kzalloc-simple.cocci b/scripts/coccinelle/alloc/kzalloc-simple.cocci
new file mode 100644
index 000000000000..2eae828fc657
--- /dev/null
+++ b/scripts/coccinelle/alloc/kzalloc-simple.cocci
@@ -0,0 +1,82 @@
+///
+/// kzalloc should be used rather than kmalloc followed by memset 0
+///
+// Confidence: High
+// Copyright: (C) 2009-2010 Julia Lawall, Nicolas Palix, DIKU.  GPLv2.
+// Copyright: (C) 2009-2010 Gilles Muller, INRIA/LiP6.  GPLv2.
+// URL: http://coccinelle.lip6.fr/rules/kzalloc.html
+// Options: -no_includes -include_headers
+//
+// Keywords: kmalloc, kzalloc
+// Version min: < 2.6.12 kmalloc
+// Version min:   2.6.14 kzalloc
+//
+virtual context
+virtual patch
+virtual org
+virtual report
+//----------------------------------------------------------
+//  For context mode
+//----------------------------------------------------------
+@depends on context@
+type T, T2;
+expression x;
+expression E1,E2;
+statement S;
+@@
+* x = (T)kmalloc(E1,E2);
+  if ((x==NULL) || ...) S
+* memset((T2)x,0,E1);
+//----------------------------------------------------------
+//  For patch mode
+//----------------------------------------------------------
+@depends on patch@
+type T, T2;
+expression x;
+expression E1,E2;
+statement S;
+@@
+- x = (T)kmalloc(E1,E2);
+ x = kzalloc(E1,E2);
+  if ((x==NULL) || ...) S
+- memset((T2)x,0,E1);
+//----------------------------------------------------------
+//  For org mode
+//----------------------------------------------------------
+@r depends on org || report@
+type T, T2;
+expression x;
+expression E1,E2;
+statement S;
+position p;
+@@
+ x = (T)kmalloc@p(E1,E2);
+ if ((x==NULL) || ...) S
+ memset((T2)x,0,E1);
+@script:python depends on org@
+p << r.p;
+x << r.x;
+@@
+msg="%s" % (x)
+msg_safe=msg.replace("[","@(").replace("]",")")
+coccilib.org.print_todo(p[0], msg_safe)
+@script:python depends on report@
+p << r.p;
+x << r.x;
+@@
+msg="WARNING: kzalloc should be used for %s, instead of kmalloc/memset" % (x)
+coccilib.report.print_report(p[0], msg)
diff --git a/scripts/coccinelle/deref_null.cocci b/scripts/coccinelle/deref_null.cocci
new file mode 100644
index 000000000000..9969d76d0f4b
--- /dev/null
+++ b/scripts/coccinelle/deref_null.cocci
@@ -0,0 +1,293 @@
+///
+/// A variable is dereference under a NULL test.
+/// Even though it is know to be NULL.
+///
+// Confidence: Moderate
+// Copyright: (C) 2010 Nicolas Palix, DIKU.  GPLv2.
+// Copyright: (C) 2010 Julia Lawall, DIKU.  GPLv2.
+// Copyright: (C) 2010 Gilles Muller, INRIA/LiP6.  GPLv2.
+// URL: http://coccinelle.lip6.fr/
+// Comments: -I ... -all_includes can give more complete results
+// Options:
+virtual context
+virtual patch
+virtual org
+virtual report
+@initialize:python depends on !context && patch && !org && !report@
+import sys
+print >> sys.stderr, "This semantic patch does not support the 'patch' mode."
+@depends on patch@
+@@
+this_rule_should_never_matches();
+@ifm depends on !patch@
+expression *E;
+statement S1,S2;
+position p1;
+@@
+if@p1 ((E == NULL && ...) || ...) S1 else S2
+// The following two rules are separate, because both can match a single
+// expression in different ways
+@pr1 depends on !patch expression@
+expression *ifm.E;
+identifier f;
+position p1;
+@@
+ (E != NULL && ...) ? <+...E->f@p1...+> : ...
+@pr2 depends on !patch expression@
+expression *ifm.E;
+identifier f;
+position p2;
+@@
+(
+  (E != NULL) && ... && <+...E->f@p2...+>
+|
+  (E == NULL) || ... || <+...E->f@p2...+>
+|
+ sizeof(<+...E->f@p2...+>)
+)
+// For org and report modes
+@r depends on !context && !patch && (org || report) exists@
+expression subE <= ifm.E;
+expression *ifm.E;
+expression E1,E2;
+identifier f;
+statement S1,S2,S3,S4;
+iterator iter;
+position p!={pr1.p1,pr2.p2};
+position ifm.p1;
+@@
+if@p1 ((E == NULL && ...) || ...)
+{
+  ... when != if (...) S1 else S2
+(
+ iter(subE,...) S4 // no use
+|
+ list_remove_head(E2,subE,...)
+|
+ subE = E1
+|
+ for(subE = E1;...;...) S4
+|
+ subE++
+|
+ ++subE
+|
+ --subE
+|
+ subE--
+|
+ &subE
+|
+ E->f@p // bad use
+)
+  ... when any
+  return ...;
+}
+else S3
+@script:python depends on !context && !patch && !org && report@
+p << r.p;
+p1 << ifm.p1;
+x << ifm.E;
+@@
+msg="ERROR: %s is NULL but dereferenced." % (x)
+coccilib.report.print_report(p[0], msg)
+cocci.include_match(False)
+@script:python depends on !context && !patch && org && !report@
+p << r.p;
+p1 << ifm.p1;
+x << ifm.E;
+@@
+msg="ERROR: %s is NULL but dereferenced." % (x)
+msg_safe=msg.replace("[","@(").replace("]",")")
+cocci.print_main(msg_safe,p)
+cocci.include_match(False)
+@s depends on !context && !patch && (org || report) exists@
+expression subE <= ifm.E;
+expression *ifm.E;
+expression E1,E2;
+identifier f;
+statement S1,S2,S3,S4;
+iterator iter;
+position p!={pr1.p1,pr2.p2};
+position ifm.p1;
+@@
+if@p1 ((E == NULL && ...) || ...)
+{
+  ... when != if (...) S1 else S2
+(
+ iter(subE,...) S4 // no use
+|
+ list_remove_head(E2,subE,...)
+|
+ subE = E1
+|
+ for(subE = E1;...;...) S4
+|
+ subE++
+|
+ ++subE
+|
+ --subE
+|
+ subE--
+|
+ &subE
+|
+ E->f@p // bad use
+)
+  ... when any
+}
+else S3
+@script:python depends on !context && !patch && !org && report@
+p << s.p;
+p1 << ifm.p1;
+x << ifm.E;
+@@
+msg="ERROR: %s is NULL but dereferenced." % (x)
+coccilib.report.print_report(p[0], msg)
+@script:python depends on !context && !patch && org && !report@
+p << s.p;
+p1 << ifm.p1;
+x << ifm.E;
+@@
+msg="ERROR: %s is NULL but dereferenced." % (x)
+msg_safe=msg.replace("[","@(").replace("]",")")
+cocci.print_main(msg_safe,p)
+// For context mode
+@depends on context && !patch && !org && !report exists@
+expression subE <= ifm.E;
+expression *ifm.E;
+expression E1,E2;
+identifier f;
+statement S1,S2,S3,S4;
+iterator iter;
+position p!={pr1.p1,pr2.p2};
+position ifm.p1;
+@@
+if@p1 ((E == NULL && ...) || ...)
+{
+  ... when != if (...) S1 else S2
+(
+ iter(subE,...) S4 // no use
+|
+ list_remove_head(E2,subE,...)
+|
+ subE = E1
+|
+ for(subE = E1;...;...) S4
+|
+ subE++
+|
+ ++subE
+|
+ --subE
+|
+ subE--
+|
+ &subE
+|
+* E->f@p // bad use
+)
+  ... when any
+  return ...;
+}
+else S3
+// The following three rules are duplicates of ifm, pr1 and pr2 respectively.
+// It is need because the previous rule as already made a "change".
+@ifm1 depends on !patch@
+expression *E;
+statement S1,S2;
+position p1;
+@@
+if@p1 ((E == NULL && ...) || ...) S1 else S2
+@pr11 depends on !patch expression@
+expression *ifm1.E;
+identifier f;
+position p1;
+@@
+ (E != NULL && ...) ? <+...E->f@p1...+> : ...
+@pr12 depends on !patch expression@
+expression *ifm1.E;
+identifier f;
+position p2;
+@@
+(
+  (E != NULL) && ... && <+...E->f@p2...+>
+|
+  (E == NULL) || ... || <+...E->f@p2...+>
+|
+ sizeof(<+...E->f@p2...+>)
+)
+@depends on context && !patch && !org && !report exists@
+expression subE <= ifm1.E;
+expression *ifm1.E;
+expression E1,E2;
+identifier f;
+statement S1,S2,S3,S4;
+iterator iter;
+position p!={pr11.p1,pr12.p2};
+position ifm1.p1;
+@@
+if@p1 ((E == NULL && ...) || ...)
+{
+  ... when != if (...) S1 else S2
+(
+ iter(subE,...) S4 // no use
+|
+ list_remove_head(E2,subE,...)
+|
+ subE = E1
+|
+ for(subE = E1;...;...) S4
+|
+ subE++
+|
+ ++subE
+|
+ --subE
+|
+ subE--
+|
+ &subE
+|
+* E->f@p // bad use
+)
+  ... when any
+}
+else S3
diff --git a/scripts/coccinelle/err_cast.cocci b/scripts/coccinelle/err_cast.cocci
new file mode 100644
index 000000000000..2ce115000af6
--- /dev/null
+++ b/scripts/coccinelle/err_cast.cocci
@@ -0,0 +1,56 @@
+///
+/// Use ERR_CAST inlined function instead of ERR_PTR(PTR_ERR(...))
+///
+// Confidence: High
+// Copyright: (C) 2009, 2010 Nicolas Palix, DIKU.  GPLv2.
+// Copyright: (C) 2009, 2010 Julia Lawall, DIKU.  GPLv2.
+// Copyright: (C) 2009, 2010 Gilles Muller, INRIA/LiP6.  GPLv2.
+// URL: http://coccinelle.lip6.fr/
+// Options:
+//
+// Keywords: ERR_PTR, PTR_ERR, ERR_CAST
+// Version min: 2.6.25
+//
+virtual context
+virtual patch
+virtual org
+virtual report
+@ depends on context && !patch && !org && !report@
+expression x;
+@@
+* ERR_PTR(PTR_ERR(x))
+@ depends on !context && patch && !org && !report @
+expression x;
+@@
+- ERR_PTR(PTR_ERR(x))
+ ERR_CAST(x)
+@r depends on !context && !patch && (org || report)@
+expression x;
+position p;
+@@
+ ERR_PTR@p(PTR_ERR(x))
+@script:python depends on org@
+p << r.p;
+x << r.x;
+@@
+msg="WARNING ERR_CAST can be used with %s" % (x)
+msg_safe=msg.replace("[","@(").replace("]",")")
+coccilib.org.print_todo(p[0], msg_safe)
+@script:python depends on report@
+p << r.p;
+x << r.x;
+@@
+msg="WARNING: ERR_CAST can be used with %s" % (x)
+coccilib.report.print_report(p[0], msg)
diff --git a/scripts/coccinelle/resource_size.cocci b/scripts/coccinelle/resource_size.cocci
new file mode 100644
index 000000000000..1935a58b39d9
--- /dev/null
+++ b/scripts/coccinelle/resource_size.cocci
@@ -0,0 +1,93 @@
+///
+/// Use resource_size function on resource object
+/// instead of explicit computation.
+///
+//  Confidence: High
+//  Copyright: (C) 2009, 2010 Nicolas Palix, DIKU.  GPLv2.
+//  Copyright: (C) 2009, 2010 Julia Lawall, DIKU.  GPLv2.
+//  Copyright: (C) 2009, 2010 Gilles Muller, INRIA/LiP6.  GPLv2.
+//  URL: http://coccinelle.lip6.fr/
+//  Options:
+//
+//  Keywords: resource_size
+//  Version min: 2.6.27 resource_size
+//
+virtual context
+virtual patch
+virtual org
+virtual report
+//----------------------------------------------------------
+//  For context mode
+//----------------------------------------------------------
+@r_context depends on context && !patch && !org@
+struct resource *res;
+@@
+* (res->end - res->start) + 1
+//----------------------------------------------------------
+//  For patch mode
+//----------------------------------------------------------
+@r_patch depends on !context && patch && !org@
+struct resource *res;
+@@
+- (res->end - res->start) + 1
+ resource_size(res)
+//----------------------------------------------------------
+//  For org mode
+//----------------------------------------------------------
+@r_org depends on !context && !patch && (org || report)@
+struct resource *res;
+position p;
+@@
+ (res->end@p - res->start) + 1
+@rbad_org depends on !context && !patch && (org || report)@
+struct resource *res;
+position p != r_org.p;
+@@
+ res->end@p - res->start
+@script:python depends on org@
+p << r_org.p;
+x << r_org.res;
+@@
+msg="ERROR with %s" % (x)
+msg_safe=msg.replace("[","@(").replace("]",")")
+coccilib.org.print_todo(p[0], msg_safe)
+@script:python depends on report@
+p << r_org.p;
+x << r_org.res;
+@@
+msg="ERROR: Missing resource_size with %s" % (x)
+coccilib.report.print_report(p[0], msg)
+@script:python depends on org@
+p << rbad_org.p;
+x << rbad_org.res;
+@@
+msg="WARNING with %s" % (x)
+msg_safe=msg.replace("[","@(").replace("]",")")
+coccilib.org.print_todo(p[0], msg_safe)
+@script:python depends on report@
+p << rbad_org.p;
+x << rbad_org.res;
+@@
+msg="WARNING: Suspicious code. resource_size is maybe missing with %s" % (x)
+coccilib.report.print_report(p[0], msg)
diff --git a/scripts/decodecode b/scripts/decodecode
index 8b30cc36744f..18ba881c3415 100755
--- a/scripts/decodecode
+++ b/scripts/decodecode
@@ -40,7 +40,7 @@ echo $code
 code=`echo $code | sed -e 's/.*Code: //'`
 width=`expr index "$code" ' '`
-width=$[($width-1)/2]
+width=$((($width-1)/2))
 case $width in
 1) type=byte ;;
 2) type=2byte ;;
@@ -48,10 +48,10 @@ case $width in
 esac
 disas() {
-        ${CROSS_COMPILE}as $AFLAGS -o $1.o $1.s &> /dev/null
+        ${CROSS_COMPILE}as $AFLAGS -o $1.o $1.s > /dev/null 2>&1
-        if [ "$ARCH" == "arm" ]; then
+        if [ "$ARCH" = "arm" ]; then
-                if [ $width == 2 ]; then
+                if [ $width -eq 2 ]; then
                        OBJDUMPFLAGS="-M force-thumb"
                fi
@@ -59,7 +59,7 @@ disas() {
        fi
        ${CROSS_COMPILE}objdump $OBJDUMPFLAGS -S $1.o | \
-                grep -v "/tmp\|Disassembly\|\.text\|^$" &> $1.dis
+                grep -v "/tmp\|Disassembly\|\.text\|^$" > $1.dis 2>&1
 }
 marker=`expr index "$code" "\<"`
diff --git a/scripts/dtc/fstree.c b/scripts/dtc/fstree.c
index 766b2694d935..8fe1bdf239f0 100644
--- a/scripts/dtc/fstree.c
+++ b/scripts/dtc/fstree.c
@@ -77,6 +77,7 @@ static struct node *read_fstree(const char *dirname)
                free(tmpnam);
        }
+        closedir(d);
        return tree;
 }
diff --git a/scripts/kconfig/.gitignore b/scripts/kconfig/.gitignore
index 6a36a76e6606..624f6502e03e 100644
--- a/scripts/kconfig/.gitignore
+++ b/scripts/kconfig/.gitignore
@@ -17,6 +17,7 @@ gconf.glade.h
 #
 conf
 mconf
+nconf
 qconf
 gconf
 kxgettext
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index de934def410f..368ae306aee4 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -8,7 +8,7 @@ PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-c
 ifdef KBUILD_KCONFIG
 Kconfig := $(KBUILD_KCONFIG)
 else
-Kconfig := arch/$(SRCARCH)/Kconfig
+Kconfig := Kconfig
 endif
 xconfig: $(obj)/qconf
@@ -145,11 +145,8 @@ check-lxdialog  := $(srctree)/$(src)/lxdialog/check-lxdialog.sh
 # Use recursively expanded variables so we do not call gcc unless
 # we really need to do so. (Do not call gcc as part of make mrproper)
-HOST_EXTRACFLAGS = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags)
+HOST_EXTRACFLAGS += $(shell $(CONFIG_SHELL) $(check-lxdialog) -ccflags) \
-HOST_LOADLIBES   = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
+                    -DLOCALE
-HOST_EXTRACFLAGS += -DLOCALE
 # ===========================================================================
 # Shared Makefile for the various kconfig executables:
@@ -208,7 +205,7 @@ clean-files     += config.pot linux.pot
 PHONY += $(obj)/dochecklxdialog
 $(addprefix $(obj)/,$(lxdialog)): $(obj)/dochecklxdialog
 $(obj)/dochecklxdialog:
-        $(Q)$(CONFIG_SHELL) $(check-lxdialog) -check $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOST_LOADLIBES)
+        $(Q)$(CONFIG_SHELL) $(check-lxdialog) -check $(HOSTCC) $(HOST_EXTRACFLAGS) $(HOSTLOADLIBES_mconf)
 always := dochecklxdialog
@@ -226,6 +223,8 @@ HOSTLOADLIBES_gconf	= `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0` -ldl
 HOSTCFLAGS_gconf.o      = `pkg-config --cflags gtk+-2.0 gmodule-2.0 libglade-2.0` \
                          -D LKC_DIRECT_LINK
+HOSTLOADLIBES_mconf   = $(shell $(CONFIG_SHELL) $(check-lxdialog) -ldflags $(HOSTCC))
 HOSTLOADLIBES_nconf     = -lmenu -lpanel -lncurses
 $(obj)/qconf.o: $(obj)/.tmp_qtcheck
@@ -236,40 +235,48 @@ $(obj)/.tmp_qtcheck: $(src)/Makefile
 # QT needs some extra effort...
 $(obj)/.tmp_qtcheck:
        @set -e; echo "  CHECK   qt"; dir=""; pkg=""; \
-        pkg-config --exists qt 2> /dev/null && pkg=qt; \
+        if ! pkg-config --exists QtCore 2> /dev/null; then \
-        pkg-config --exists qt-mt 2> /dev/null && pkg=qt-mt; \
+            echo "* Unable to find the QT4 tool qmake. Trying to use QT3"; \
-        if [ -n "$$pkg" ]; then \
+            pkg-config --exists qt 2> /dev/null && pkg=qt; \
-          cflags="\$$(shell pkg-config $$pkg --cflags)"; \
+            pkg-config --exists qt-mt 2> /dev/null && pkg=qt-mt; \
-          libs="\$$(shell pkg-config $$pkg --libs)"; \
+            if [ -n "$$pkg" ]; then \
-          moc="\$$(shell pkg-config $$pkg --variable=prefix)/bin/moc"; \
+              cflags="\$$(shell pkg-config $$pkg --cflags)"; \
-          dir="$$(pkg-config $$pkg --variable=prefix)"; \
+              libs="\$$(shell pkg-config $$pkg --libs)"; \
+              moc="\$$(shell pkg-config $$pkg --variable=prefix)/bin/moc"; \
+              dir="$$(pkg-config $$pkg --variable=prefix)"; \
+            else \
+              for d in $$QTDIR /usr/share/qt* /usr/lib/qt*; do \
+                if [ -f $$d/include/qconfig.h ]; then dir=$$d; break; fi; \
+              done; \
+              if [ -z "$$dir" ]; then \
+                echo "*"; \
+                echo "* Unable to find any QT installation. Please make sure that"; \
+                echo "* the QT4 or QT3 development package is correctly installed and"; \
+                echo "* either qmake can be found or install pkg-config or set"; \
+                echo "* the QTDIR environment variable to the correct location."; \
+                echo "*"; \
+                false; \
+              fi; \
+              libpath=$$dir/lib; lib=qt; osdir=""; \
+              $(HOSTCXX) -print-multi-os-directory > /dev/null 2>&1 && \
+                osdir=x$$($(HOSTCXX) -print-multi-os-directory); \
+              test -d $$libpath/$$osdir && libpath=$$libpath/$$osdir; \
+              test -f $$libpath/libqt-mt.so && lib=qt-mt; \
+              cflags="-I$$dir/include"; \
+              libs="-L$$libpath -Wl,-rpath,$$libpath -l$$lib"; \
+              moc="$$dir/bin/moc"; \
+            fi; \
+            if [ ! -x $$dir/bin/moc -a -x /usr/bin/moc ]; then \
+              echo "*"; \
+              echo "* Unable to find $$dir/bin/moc, using /usr/bin/moc instead."; \
+              echo "*"; \
+              moc="/usr/bin/moc"; \
+            fi; \
        else \
-          for d in $$QTDIR /usr/share/qt* /usr/lib/qt*; do \
+          cflags="\$$(shell pkg-config QtCore QtGui Qt3Support --cflags)"; \
-            if [ -f $$d/include/qconfig.h ]; then dir=$$d; break; fi; \
+          libs="\$$(shell pkg-config QtCore QtGui Qt3Support --libs)"; \
-          done; \
+          binpath="\$$(shell pkg-config QtCore --variable=prefix)"; \
-          if [ -z "$$dir" ]; then \
+          moc="$$binpath/bin/moc"; \
-            echo "*"; \
-            echo "* Unable to find the QT3 installation. Please make sure that"; \
-            echo "* the QT3 development package is correctly installed and"; \
-            echo "* either install pkg-config or set the QTDIR environment"; \
-            echo "* variable to the correct location."; \
-            echo "*"; \
-            false; \
-          fi; \
-          libpath=$$dir/lib; lib=qt; osdir=""; \
-          $(HOSTCXX) -print-multi-os-directory > /dev/null 2>&1 && \
-            osdir=x$$($(HOSTCXX) -print-multi-os-directory); \
-          test -d $$libpath/$$osdir && libpath=$$libpath/$$osdir; \
-          test -f $$libpath/libqt-mt.so && lib=qt-mt; \
-          cflags="-I$$dir/include"; \
-          libs="-L$$libpath -Wl,-rpath,$$libpath -l$$lib"; \
-          moc="$$dir/bin/moc"; \
-        fi; \
-        if [ ! -x $$dir/bin/moc -a -x /usr/bin/moc ]; then \
-          echo "*"; \
-          echo "* Unable to find $$dir/bin/moc, using /usr/bin/moc instead."; \
-          echo "*"; \
-          moc="/usr/bin/moc"; \
        fi; \
        echo "KC_QT_CFLAGS=$$cflags" > $@; \
        echo "KC_QT_LIBS=$$libs" >> $@; \
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 4f0ed5b3a75e..5459a38be866 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -425,9 +425,9 @@ static void check_conf(struct menu *menu)
                    (sym_is_choice(sym) && sym_get_tristate_value(sym) == yes)) {
                        if (input_mode == listnewconfig) {
                                if (sym->name && !sym_is_choice_value(sym)) {
-                                        printf("CONFIG_%s\n", sym->name);
+                                        printf("%s%s\n", CONFIG_, sym->name);
                                }
-                        } else {
+                        } else if (input_mode != oldnoconfig) {
                                if (!conf_cnt++)
                                        printf(_("*\n* Restart config...\n*\n"));
                                rootEntry = menu_get_parent_menu(menu);
@@ -466,7 +466,7 @@ int main(int ac, char **av)
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-        while ((opt = getopt_long_only(ac, av, "", long_opts, NULL)) != -1) {
+        while ((opt = getopt_long(ac, av, "", long_opts, NULL)) != -1) {
                input_mode = (enum input_mode)opt;
                switch (opt) {
                case silentoldconfig:
@@ -508,8 +508,7 @@ int main(int ac, char **av)
                name = conf_get_configname();
                if (stat(name, &tmpstat)) {
                        fprintf(stderr, _("***\n"
-                                "*** You have not yet configured your kernel!\n"
+                                "*** Configuration file \"%s\" not found!\n"
-                                "*** (missing kernel config file \"%s\")\n"
                                "***\n"
                                "*** Please run some configurator (e.g. \"make oldconfig\" or\n"
                                "*** \"make menuconfig\" or \"make xconfig\").\n"
@@ -571,7 +570,7 @@ int main(int ac, char **av)
                        name = getenv("KCONFIG_NOSILENTUPDATE");
                        if (name && *name) {
                                fprintf(stderr,
-                                        _("\n*** Kernel configuration requires explicit update.\n\n"));
+                                        _("\n*** The configuration requires explicit update.\n\n"));
                                return 1;
                        }
                }
@@ -599,12 +598,12 @@ int main(int ac, char **av)
                break;
        case savedefconfig:
                break;
-        case oldconfig:
        case oldaskconfig:
                rootEntry = &rootmenu;
                conf(&rootmenu);
                input_mode = silentoldconfig;
                /* fall through */
+        case oldconfig:
        case listnewconfig:
        case oldnoconfig:
        case silentoldconfig:
@@ -623,11 +622,11 @@ int main(int ac, char **av)
                 * All other commands are only used to generate a config.
                 */
                if (conf_get_changed() && conf_write(NULL)) {
-                        fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n"));
+                        fprintf(stderr, _("\n*** Error during writing of the configuration.\n\n"));
                        exit(1);
                }
                if (conf_write_autoconf()) {
-                        fprintf(stderr, _("\n*** Error during update of the kernel configuration.\n\n"));
+                        fprintf(stderr, _("\n*** Error during update of the configuration.\n\n"));
                        return 1;
                }
        } else if (input_mode == savedefconfig) {
@@ -638,7 +637,7 @@ int main(int ac, char **av)
                }
        } else if (input_mode != listnewconfig) {
                if (conf_write(NULL)) {
-                        fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n"));
+                        fprintf(stderr, _("\n*** Error during writing of the configuration.\n\n"));
                        exit(1);
                }
        }
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index c07060ab7820..9df80114b47b 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -246,24 +246,23 @@ load:
        while (fgets(line, sizeof(line), in)) {
                conf_lineno++;
                sym = NULL;
-                switch (line[0]) {
+                if (line[0] == '#') {
-                case '#':
+                        if (memcmp(line + 2, CONFIG_, strlen(CONFIG_)))
-                        if (memcmp(line + 2, "CONFIG_", 7))
                                continue;
-                        p = strchr(line + 9, ' ');
+                        p = strchr(line + 2 + strlen(CONFIG_), ' ');
                        if (!p)
                                continue;
                        *p++ = 0;
                        if (strncmp(p, "is not set", 10))
                                continue;
                        if (def == S_DEF_USER) {
-                                sym = sym_find(line + 9);
+                                sym = sym_find(line + 2 + strlen(CONFIG_));
                                if (!sym) {
                                        sym_add_change_count(1);
-                                        break;
+                                        goto setsym;
                                }
                        } else {
-                                sym = sym_lookup(line + 9, 0);
+                                sym = sym_lookup(line + 2 + strlen(CONFIG_), 0);
                                if (sym->type == S_UNKNOWN)
                                        sym->type = S_BOOLEAN;
                        }
@@ -279,13 +278,8 @@ load:
                        default:
                                ;
                        }
-                        break;
+                } else if (memcmp(line, CONFIG_, strlen(CONFIG_)) == 0) {
-                case 'C':
+                        p = strchr(line + strlen(CONFIG_), '=');
-                        if (memcmp(line, "CONFIG_", 7)) {
-                                conf_warning("unexpected data");
-                                continue;
-                        }
-                        p = strchr(line + 7, '=');
                        if (!p)
                                continue;
                        *p++ = 0;
@@ -296,13 +290,13 @@ load:
                                        *p2 = 0;
                        }
                        if (def == S_DEF_USER) {
-                                sym = sym_find(line + 7);
+                                sym = sym_find(line + strlen(CONFIG_));
                                if (!sym) {
                                        sym_add_change_count(1);
-                                        break;
+                                        goto setsym;
                                }
                        } else {
-                                sym = sym_lookup(line + 7, 0);
+                                sym = sym_lookup(line + strlen(CONFIG_), 0);
                                if (sym->type == S_UNKNOWN)
                                        sym->type = S_OTHER;
                        }
@@ -311,14 +305,12 @@ load:
                        }
                        if (conf_set_sym_val(sym, def, def_flags, p))
                                continue;
-                        break;
+                } else {
-                case '\r':
+                        if (line[0] != '\r' && line[0] != '\n')
-                case '\n':
+                                conf_warning("unexpected data");
-                        break;
-                default:
-                        conf_warning("unexpected data");
                        continue;
                }
+setsym:
                if (sym && sym_is_choice_value(sym)) {
                        struct symbol *cs = prop_get_symbol(sym_get_choice_prop(sym));
                        switch (sym->def[def].tri) {
@@ -431,9 +423,9 @@ static void conf_write_string(bool headerfile, const char *name,
 {
        int l;
        if (headerfile)
-                fprintf(out, "#define CONFIG_%s \"", name);
+                fprintf(out, "#define %s%s \"", CONFIG_, name);
        else
-                fprintf(out, "CONFIG_%s=\"", name);
+                fprintf(out, "%s%s=\"", CONFIG_, name);
        while (1) {
                l = strcspn(str, "\"\\");
@@ -459,13 +451,14 @@ static void conf_write_symbol(struct symbol *sym, enum symbol_type type,
                switch (sym_get_tristate_value(sym)) {
                case no:
                        if (write_no)
-                                fprintf(out, "# CONFIG_%s is not set\n", sym->name);
+                                fprintf(out, "# %s%s is not set\n",
+                                    CONFIG_, sym->name);
                        break;
                case mod:
-                        fprintf(out, "CONFIG_%s=m\n", sym->name);
+                        fprintf(out, "%s%s=m\n", CONFIG_, sym->name);
                        break;
                case yes:
-                        fprintf(out, "CONFIG_%s=y\n", sym->name);
+                        fprintf(out, "%s%s=y\n", CONFIG_, sym->name);
                        break;
                }
                break;
@@ -475,7 +468,7 @@ static void conf_write_symbol(struct symbol *sym, enum symbol_type type,
        case S_HEX:
        case S_INT:
                str = sym_get_string_value(sym);
-                fprintf(out, "CONFIG_%s=%s\n", sym->name, str);
+                fprintf(out, "%s%s=%s\n", CONFIG_, sym->name, str);
                break;
        case S_OTHER:
        case S_UNKNOWN:
@@ -567,7 +560,7 @@ int conf_write(const char *name)
        struct menu *menu;
        const char *basename;
        const char *str;
-        char dirname[128], tmpname[128], newname[128];
+        char dirname[PATH_MAX+1], tmpname[PATH_MAX+1], newname[PATH_MAX+1];
        enum symbol_type type;
        time_t now;
        int use_timestamp = 1;
@@ -607,8 +600,6 @@ int conf_write(const char *name)
        if (!out)
                return 1;
-        sym = sym_lookup("KERNELVERSION", 0);
-        sym_calc_value(sym);
        time(&now);
        env = getenv("KCONFIG_NOTIMESTAMP");
        if (env && *env)
@@ -616,10 +607,10 @@ int conf_write(const char *name)
        fprintf(out, _("#\n"
                       "# Automatically generated make config: don't edit\n"
-                       "# Linux kernel version: %s\n"
+                       "# %s\n"
                       "%s%s"
                       "#\n"),
-                     sym_get_string_value(sym),
+                     rootmenu.prompt->text,
                     use_timestamp ? "# " : "",
                     use_timestamp ? ctime(&now) : "");
@@ -686,7 +677,7 @@ next:
 static int conf_split_config(void)
 {
        const char *name;
-        char path[128];
+        char path[PATH_MAX+1];
        char *s, *d, c;
        struct symbol *sym;
        struct stat sb;
@@ -828,25 +819,23 @@ int conf_write_autoconf(void)
                return 1;
        }
-        sym = sym_lookup("KERNELVERSION", 0);
-        sym_calc_value(sym);
        time(&now);
        fprintf(out, "#\n"
                     "# Automatically generated make config: don't edit\n"
-                     "# Linux kernel version: %s\n"
+                     "# %s\n"
                     "# %s"
                     "#\n",
-                     sym_get_string_value(sym), ctime(&now));
+                     rootmenu.prompt->text, 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"
+                       " * %s\n"
                       " * %s"
                       " */\n"
                       "#define AUTOCONF_INCLUDED\n",
-                       sym_get_string_value(sym), ctime(&now));
+                       rootmenu.prompt->text, ctime(&now));
        for_all_symbols(i, sym) {
                sym_calc_value(sym);
@@ -864,14 +853,17 @@ int conf_write_autoconf(void)
                        case no:
                                break;
                        case mod:
-                                fprintf(tristate, "CONFIG_%s=M\n", sym->name);
+                                fprintf(tristate, "%s%s=M\n",
-                                fprintf(out_h, "#define CONFIG_%s_MODULE 1\n", sym->name);
+                                    CONFIG_, sym->name);
+                                fprintf(out_h, "#define %s%s_MODULE 1\n",
+                                    CONFIG_, sym->name);
                                break;
                        case yes:
                                if (sym->type == S_TRISTATE)
-                                        fprintf(tristate, "CONFIG_%s=Y\n",
+                                        fprintf(tristate,"%s%s=Y\n",
-                                                        sym->name);
+                                            CONFIG_, sym->name);
-                                fprintf(out_h, "#define CONFIG_%s 1\n", sym->name);
+                                fprintf(out_h, "#define %s%s 1\n",
+                                    CONFIG_, sym->name);
                                break;
                        }
                        break;
@@ -881,12 +873,14 @@ int conf_write_autoconf(void)
                case S_HEX:
                        str = sym_get_string_value(sym);
                        if (str[0] != '0' || (str[1] != 'x' && str[1] != 'X')) {
-                                fprintf(out_h, "#define CONFIG_%s 0x%s\n", sym->name, str);
+                                fprintf(out_h, "#define %s%s 0x%s\n",
+                                    CONFIG_, sym->name, str);
                                break;
                        }
                case S_INT:
                        str = sym_get_string_value(sym);
-                        fprintf(out_h, "#define CONFIG_%s %s\n", sym->name, str);
+                        fprintf(out_h, "#define %s%s %s\n",
+                            CONFIG_, sym->name, str);
                        break;
                default:
                        break;
diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h
index 6ee2e4fb1481..184eb6a0b505 100644
--- a/scripts/kconfig/expr.h
+++ b/scripts/kconfig/expr.h
@@ -18,7 +18,7 @@ extern "C" {
 struct file {
        struct file *next;
        struct file *parent;
-        char *name;
+        const char *name;
        int lineno;
        int flags;
 };
@@ -165,7 +165,6 @@ struct menu {
        struct symbol *sym;
        struct property *prompt;
        struct expr *dep;
-        struct expr *dir_dep;
        unsigned int flags;
        char *help;
        struct file *file;
diff --git a/scripts/kconfig/gconf.c b/scripts/kconfig/gconf.c
index d66988265f89..455896164d72 100644
--- a/scripts/kconfig/gconf.c
+++ b/scripts/kconfig/gconf.c
@@ -133,7 +133,6 @@ void init_main_window(const gchar * glade_file)
        GladeXML *xml;
        GtkWidget *widget;
        GtkTextBuffer *txtbuf;
-        char title[256];
        GtkStyle *style;
        xml = glade_xml_new(glade_file, "window1", NULL);
@@ -210,9 +209,7 @@ void init_main_window(const gchar * glade_file)
                                          /*"style", PANGO_STYLE_OBLIQUE, */
                                          NULL);
-        sprintf(title, _("Linux Kernel v%s Configuration"),
+        gtk_window_set_title(GTK_WINDOW(main_wnd), rootmenu.prompt->text);
-                getenv("KERNELVERSION"));
-        gtk_window_set_title(GTK_WINDOW(main_wnd), title);
        gtk_widget_show(main_wnd);
 }
@@ -671,8 +668,7 @@ void on_introduction1_activate(GtkMenuItem * menuitem, gpointer user_data)
 {
        GtkWidget *dialog;
        const gchar *intro_text = _(
-            "Welcome to gkc, the GTK+ graphical kernel configuration tool\n"
+            "Welcome to gkc, the GTK+ graphical configuration tool\n"
-            "for Linux.\n"
            "For each option, a blank box indicates the feature is disabled, a\n"
            "check indicates it is enabled, and a dot indicates that it is to\n"
            "be compiled as a module.  Clicking on the box will cycle through the three states.\n"
@@ -1531,12 +1527,6 @@ int main(int ac, char *av[])
        else
                glade_file = g_strconcat(g_get_current_dir(), "/", av[0], ".glade", NULL);
-        /* Load the interface and connect signals */
-        init_main_window(glade_file);
-        init_tree_model();
-        init_left_tree();
-        init_right_tree();
        /* Conf stuffs */
        if (ac > 1 && av[1][0] == '-') {
                switch (av[1][1]) {
@@ -1556,6 +1546,12 @@ int main(int ac, char *av[])
        fixup_rootmenu(&rootmenu);
        conf_read(NULL);
+        /* Load the interface and connect signals */
+        init_main_window(glade_file);
+        init_tree_model();
+        init_left_tree();
+        init_right_tree();
        switch (view_mode) {
        case SINGLE_VIEW:
                display_tree_part();
diff --git a/scripts/kconfig/gconf.glade b/scripts/kconfig/gconf.glade
index d52b0a75d824..aa483cb32755 100644
--- a/scripts/kconfig/gconf.glade
+++ b/scripts/kconfig/gconf.glade
@@ -1,5 +1,4 @@
 <?xml version="1.0" standalone="no"?> <!--*- mode: xml -*-->
-<!DOCTYPE glade-interface SYSTEM "http://glade.gnome.org/glade-2.0.dtd">
 <glade-interface>
diff --git a/scripts/kconfig/kxgettext.c b/scripts/kconfig/kxgettext.c
index dcc3fcc0cc9a..e9d8e791bf0d 100644
--- a/scripts/kconfig/kxgettext.c
+++ b/scripts/kconfig/kxgettext.c
@@ -63,11 +63,11 @@ next:
 struct file_line {
        struct file_line *next;
-        char*            file;
+        const char *file;
-        int              lineno;
+        int lineno;
 };
-static struct file_line *file_line__new(char *file, int lineno)
+static struct file_line *file_line__new(const char *file, int lineno)
 {
        struct file_line *self = malloc(sizeof(*self));
@@ -90,7 +90,8 @@ struct message {
 static struct message *message__list;
-static struct message *message__new(const char *msg, char *option, char *file, int lineno)
+static struct message *message__new(const char *msg, char *option,
+                                    const char *file, int lineno)
 {
        struct message *self = malloc(sizeof(*self));
@@ -130,7 +131,8 @@ static struct message *mesage__find(const char *msg)
        return m;
 }
-static int message__add_file_line(struct message *self, char *file, int lineno)
+static int message__add_file_line(struct message *self, const char *file,
+                                  int lineno)
 {
        int rc = -1;
        struct file_line *fl = file_line__new(file, lineno);
@@ -145,7 +147,8 @@ out:
        return rc;
 }
-static int message__add(const char *msg, char *option, char *file, int lineno)
+static int message__add(const char *msg, char *option, const char *file,
+                        int lineno)
 {
        int rc = 0;
        char bf[16384];
diff --git a/scripts/kconfig/lex.zconf.c_shipped b/scripts/kconfig/lex.zconf.c_shipped
index fdc7113b08d1..6eb039718259 100644
--- a/scripts/kconfig/lex.zconf.c_shipped
+++ b/scripts/kconfig/lex.zconf.c_shipped
@@ -2373,9 +2373,10 @@ void zconf_nextfile(const char *name)
        memset(buf, 0, sizeof(*buf));
        current_buf->state = YY_CURRENT_BUFFER;
-        zconfin = zconf_fopen(name);
+        zconfin = zconf_fopen(file->name);
        if (!zconfin) {
-                printf("%s:%d: can't open file \"%s\"\n", zconf_curname(), zconf_lineno(), name);
+                printf("%s:%d: can't open file \"%s\"\n",
+                    zconf_curname(), zconf_lineno(), file->name);
                exit(1);
        }
        zconf_switch_to_buffer(zconf_create_buffer(zconfin,YY_BUF_SIZE));
@@ -2422,7 +2423,7 @@ int zconf_lineno(void)
        return current_pos.lineno;
 }
-char *zconf_curname(void)
+const char *zconf_curname(void)
 {
        return current_pos.file ? current_pos.file->name : "<none>";
 }
diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h
index bdf71bd31412..753cdbd7b805 100644
--- a/scripts/kconfig/lkc.h
+++ b/scripts/kconfig/lkc.h
@@ -31,12 +31,18 @@ extern "C" {
 #define SRCTREE "srctree"
+#ifndef PACKAGE
 #define PACKAGE "linux"
+#endif
 #define LOCALEDIR "/usr/share/locale"
 #define _(text) gettext(text)
 #define N_(text) (text)
+#ifndef CONFIG_
+#define CONFIG_ "CONFIG_"
+#endif
 #define TF_COMMAND      0x0001
 #define TF_PARAM        0x0002
@@ -70,7 +76,7 @@ FILE *zconf_fopen(const char *name);
 void zconf_initscan(const char *name);
 void zconf_nextfile(const char *name);
 int zconf_lineno(void);
-char *zconf_curname(void);
+const char *zconf_curname(void);
 /* conf.c */
 void xfgets(char *str, int size, FILE *in);
diff --git a/scripts/kconfig/lkc_proto.h b/scripts/kconfig/lkc_proto.h
index 481d4849d0f0..17342fef38b9 100644
--- a/scripts/kconfig/lkc_proto.h
+++ b/scripts/kconfig/lkc_proto.h
@@ -30,6 +30,7 @@ P(symbol_hash,struct symbol *,[SYMBOL_HASHSIZE]);
 P(sym_lookup,struct symbol *,(const char *name, int flags));
 P(sym_find,struct symbol *,(const char *name));
+P(sym_expand_string_value,const char *,(const char *in));
 P(sym_re_search,struct symbol **,(const char *pattern));
 P(sym_type_name,const char *,(enum symbol_type type));
 P(sym_calc_value,void,(struct symbol *sym));
diff --git a/scripts/kconfig/lxdialog/check-lxdialog.sh b/scripts/kconfig/lxdialog/check-lxdialog.sh
index fcef0f59d553..82cc3a85e7f8 100644
--- a/scripts/kconfig/lxdialog/check-lxdialog.sh
+++ b/scripts/kconfig/lxdialog/check-lxdialog.sh
@@ -23,6 +23,8 @@ ccflags()
                echo '-I/usr/include/ncurses -DCURSES_LOC="<ncurses.h>"'
        elif [ -f /usr/include/ncurses/curses.h ]; then
                echo '-I/usr/include/ncurses -DCURSES_LOC="<ncurses/curses.h>"'
+        elif [ -f /usr/include/ncursesw/curses.h ]; then
+                echo '-I/usr/include/ncursesw -DCURSES_LOC="<ncursesw/curses.h>"'
        elif [ -f /usr/include/ncurses.h ]; then
                echo '-DCURSES_LOC="<ncurses.h>"'
        else
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index d2f6e056c058..d433c7a24745 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -25,11 +25,9 @@
 static const char mconf_readme[] = N_(
 "Overview\n"
 "--------\n"
-"Some kernel features may be built directly into the kernel.\n"
+"This interface let you select features and parameters for the build.\n"
-"Some may be made into loadable runtime modules.  Some features\n"
+"Features can either be built-in, modularized, or ignored. Parameters\n"
-"may be completely removed altogether.  There are also certain\n"
+"must be entered in as decimal or hexadecimal numbers or text.\n"
-"kernel parameters which are not really features, but must be\n"
-"entered in as decimal or hexadecimal numbers or possibly text.\n"
 "\n"
 "Menu items beginning with following braces represent features that\n"
 "  [ ] can be built in or removed\n"
@@ -117,7 +115,7 @@ static const char mconf_readme[] = N_(
 "-----------------------------\n"
 "Menuconfig supports the use of alternate configuration files for\n"
 "those who, for various reasons, find it necessary to switch\n"
-"between different kernel configurations.\n"
+"between different configurations.\n"
 "\n"
 "At the end of the main menu you will find two options.  One is\n"
 "for saving the current configuration to a file of your choosing.\n"
@@ -150,9 +148,9 @@ static const char mconf_readme[] = N_(
 "\n"
 "Optional personality available\n"
 "------------------------------\n"
-"If you prefer to have all of the kernel options listed in a single\n"
+"If you prefer to have all of the options listed in a single menu, rather\n"
-"menu, rather than the default multimenu hierarchy, run the menuconfig\n"
+"than the default multimenu hierarchy, run the menuconfig with\n"
-"with MENUCONFIG_MODE environment variable set to single_menu. Example:\n"
+"MENUCONFIG_MODE environment variable set to single_menu. Example:\n"
 "\n"
 "make MENUCONFIG_MODE=single_menu menuconfig\n"
 "\n"
@@ -207,12 +205,12 @@ load_config_text[] = N_(
        "last retrieved.  Leave blank to abort."),
 load_config_help[] = N_(
        "\n"
-        "For various reasons, one may wish to keep several different kernel\n"
+        "For various reasons, one may wish to keep several different\n"
        "configurations available on a single machine.\n"
        "\n"
        "If you have saved a previous configuration in a file other than the\n"
-        "kernel's default, entering the name of the file here will allow you\n"
+        "default one, entering its name here will allow you to modify that\n"
-        "to modify that configuration.\n"
+        "configuration.\n"
        "\n"
        "If you are uncertain, then you have probably never used alternate\n"
        "configuration files. You should therefore leave this blank to abort.\n"),
@@ -221,8 +219,8 @@ save_config_text[] = N_(
        "as an alternate.  Leave blank to abort."),
 save_config_help[] = N_(
        "\n"
-        "For various reasons, one may wish to keep different kernel\n"
+        "For various reasons, one may wish to keep different configurations\n"
-        "configurations available on a single machine.\n"
+        "available on a single machine.\n"
        "\n"
        "Entering a file name here will allow you to later retrieve, modify\n"
        "and use the current configuration as an alternate to whatever\n"
@@ -232,7 +230,7 @@ save_config_help[] = N_(
        "leave this blank.\n"),
 search_help[] = N_(
        "\n"
-        "Search for CONFIG_ symbols and display their relations.\n"
+        "Search for symbols and display their relations.\n"
        "Regular expressions are allowed.\n"
        "Example: search for \"^FOO\"\n"
        "Result:\n"
@@ -249,7 +247,7 @@ search_help[] = N_(
        "Selected by: BAR\n"
        "-----------------------------------------------------------------\n"
        "o The line 'Prompt:' shows the text used in the menu structure for\n"
-        "  this CONFIG_ symbol\n"
+        "  this symbol\n"
        "o The 'Defined at' line tell at what file / line number the symbol\n"
        "  is defined\n"
        "o The 'Depends on:' line tell what symbols needs to be defined for\n"
@@ -265,9 +263,9 @@ search_help[] = N_(
        "Only relevant lines are shown.\n"
        "\n\n"
        "Search examples:\n"
-        "Examples: USB  => find all CONFIG_ symbols containing USB\n"
+        "Examples: USB  => find all symbols containing USB\n"
-        "          ^USB => find all CONFIG_ symbols starting with USB\n"
+        "          ^USB => find all symbols starting with USB\n"
-        "          USB$ => find all CONFIG_ symbols ending with USB\n"
+        "          USB$ => find all symbols ending with USB\n"
        "\n");
 static int indent;
@@ -290,13 +288,9 @@ static void set_config_filename(const char *config_filename)
 {
        static char menu_backtitle[PATH_MAX+128];
        int size;
-        struct symbol *sym;
-        sym = sym_lookup("KERNELVERSION", 0);
-        sym_calc_value(sym);
        size = snprintf(menu_backtitle, sizeof(menu_backtitle),
-                        _("%s - Linux Kernel v%s Configuration"),
+                        "%s - %s", config_filename, rootmenu.prompt->text);
-                        config_filename, sym_get_string_value(sym));
        if (size >= sizeof(menu_backtitle))
                menu_backtitle[sizeof(menu_backtitle)-1] = '\0';
        set_dialog_backtitle(menu_backtitle);
@@ -316,8 +310,8 @@ static void search_conf(void)
 again:
        dialog_clear();
        dres = dialog_inputbox(_("Search Configuration Parameter"),
-                              _("Enter CONFIG_ (sub)string to search for "
+                              _("Enter " CONFIG_ " (sub)string to search for "
-                                "(with or without \"CONFIG\")"),
+                                "(with or without \"" CONFIG_ "\")"),
                              10, 75, "");
        switch (dres) {
        case 0:
@@ -329,10 +323,10 @@ again:
                return;
        }
-        /* strip CONFIG_ if necessary */
+        /* strip the prefix if necessary */
        dialog_input = dialog_input_result;
-        if (strncasecmp(dialog_input_result, "CONFIG_", 7) == 0)
+        if (strncasecmp(dialog_input_result, CONFIG_, strlen(CONFIG_)) == 0)
-                dialog_input += 7;
+                dialog_input += strlen(CONFIG_);
        sym_arr = sym_re_search(dialog_input);
        res = get_relations_str(sym_arr);
@@ -834,7 +828,7 @@ int main(int ac, char **av)
                if (conf_get_changed())
                        res = dialog_yesno(NULL,
                                           _("Do you wish to save your "
-                                             "new kernel configuration?\n"
+                                             "new configuration?\n"
                                             "<ESC><ESC> to continue."),
                                           6, 60);
                else
@@ -846,20 +840,20 @@ int main(int ac, char **av)
        case 0:
                if (conf_write(filename)) {
                        fprintf(stderr, _("\n\n"
-                                "Error during writing of the kernel configuration.\n"
+                                "Error while writing of the configuration.\n"
-                                "Your kernel configuration changes were NOT saved."
+                                "Your configuration changes were NOT saved."
                                "\n\n"));
                        return 1;
                }
        case -1:
                printf(_("\n\n"
-                        "*** End of Linux kernel configuration.\n"
+                        "*** End of the configuration.\n"
-                        "*** Execute 'make' to build the kernel or try 'make help'."
+                        "*** Execute 'make' to start the build or try 'make help'."
                        "\n\n"));
                break;
        default:
                fprintf(stderr, _("\n\n"
-                        "Your kernel configuration changes were NOT saved."
+                        "Your configuration changes were NOT saved."
                        "\n\n"));
        }
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index 4fb590247f33..7e83aef42c6d 100644
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -10,7 +10,7 @@
 #include "lkc.h"
 static const char nohelp_text[] = N_(
-        "There is no help available for this kernel option.\n");
+        "There is no help available for this option.\n");
 struct menu rootmenu;
 static struct menu **last_entry_ptr;
@@ -107,7 +107,6 @@ static struct expr *menu_check_dep(struct expr *e)
 void menu_add_dep(struct expr *dep)
 {
        current_entry->dep = expr_alloc_and(current_entry->dep, menu_check_dep(dep));
-        current_entry->dir_dep = current_entry->dep;
 }
 void menu_set_type(int type)
@@ -139,7 +138,7 @@ struct property *menu_add_prop(enum prop_type type, char *prompt, struct expr *e
                        while (isspace(*prompt))
                                prompt++;
                }
-                if (current_entry->prompt)
+                if (current_entry->prompt && current_entry != &rootmenu)
                        prop_warn(prop, "prompt redefined");
                current_entry->prompt = prop;
        }
@@ -291,10 +290,6 @@ void menu_finalize(struct menu *parent)
                for (menu = parent->list; menu; menu = menu->next)
                        menu_finalize(menu);
        } else if (sym) {
-                /* ignore inherited dependencies for dir_dep */
-                sym->dir_dep.expr = expr_transform(expr_copy(parent->dir_dep));
-                sym->dir_dep.expr = expr_eliminate_dups(sym->dir_dep.expr);
                basedep = parent->prompt ? parent->prompt->visible.expr : NULL;
                basedep = expr_trans_compare(basedep, E_UNEQUAL, &symbol_no);
                basedep = expr_eliminate_dups(expr_transform(basedep));
@@ -325,6 +320,8 @@ void menu_finalize(struct menu *parent)
                        parent->next = last_menu->next;
                        last_menu->next = NULL;
                }
+                sym->dir_dep.expr = parent->dep;
        }
        for (menu = parent->list; menu; menu = menu->next) {
                if (sym && sym_is_choice(sym) &&
@@ -566,7 +563,7 @@ void menu_get_ext_help(struct menu *menu, struct gstr *help)
        if (menu_has_help(menu)) {
                if (sym->name) {
-                        str_printf(help, "CONFIG_%s:\n\n", sym->name);
+                        str_printf(help, "%s%s:\n\n", CONFIG_, sym->name);
                        str_append(help, _(menu_get_help(menu)));
                        str_append(help, "\n");
                }
diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c
index 16233a9382c8..272a987f23e0 100644
--- a/scripts/kconfig/nconf.c
+++ b/scripts/kconfig/nconf.c
@@ -15,11 +15,9 @@
 static const char nconf_readme[] = N_(
 "Overview\n"
 "--------\n"
-"Some kernel features may be built directly into the kernel.\n"
+"This interface let you select features and parameters for the build.\n"
-"Some may be made into loadable runtime modules.  Some features\n"
+"Features can either be built-in, modularized, or ignored. Parameters\n"
-"may be completely removed altogether.  There are also certain\n"
+"must be entered in as decimal or hexadecimal numbers or text.\n"
-"kernel parameters which are not really features, but must be\n"
-"entered in as decimal or hexadecimal numbers or possibly text.\n"
 "\n"
 "Menu items beginning with following braces represent features that\n"
 "  [ ] can be built in or removed\n"
@@ -95,7 +93,7 @@ static const char nconf_readme[] = N_(
 "-----------------------------\n"
 "nconfig supports the use of alternate configuration files for\n"
 "those who, for various reasons, find it necessary to switch\n"
-"between different kernel configurations.\n"
+"between different configurations.\n"
 "\n"
 "At the end of the main menu you will find two options.  One is\n"
 "for saving the current configuration to a file of your choosing.\n"
@@ -128,9 +126,9 @@ static const char nconf_readme[] = N_(
 "\n"
 "Optional personality available\n"
 "------------------------------\n"
-"If you prefer to have all of the kernel options listed in a single\n"
+"If you prefer to have all of the options listed in a single menu, rather\n"
-"menu, rather than the default multimenu hierarchy, run the nconfig\n"
+"than the default multimenu hierarchy, run the nconfig with NCONFIG_MODE\n"
-"with NCONFIG_MODE environment variable set to single_menu. Example:\n"
+"environment variable set to single_menu. Example:\n"
 "\n"
 "make NCONFIG_MODE=single_menu nconfig\n"
 "\n"
@@ -185,19 +183,19 @@ setmod_text[] = N_(
 "has been configured as a module.\n"
 "As a result, this feature will be built as a module."),
 nohelp_text[] = N_(
-"There is no help available for this kernel option.\n"),
+"There is no help available for this option.\n"),
 load_config_text[] = N_(
 "Enter the name of the configuration file you wish to load.\n"
 "Accept the name shown to restore the configuration you\n"
 "last retrieved.  Leave blank to abort."),
 load_config_help[] = N_(
 "\n"
-"For various reasons, one may wish to keep several different kernel\n"
+"For various reasons, one may wish to keep several different\n"
 "configurations available on a single machine.\n"
 "\n"
 "If you have saved a previous configuration in a file other than the\n"
-"kernel's default, entering the name of the file here will allow you\n"
+"default one, entering its name here will allow you to modify that\n"
-"to modify that configuration.\n"
+"configuration.\n"
 "\n"
 "If you are uncertain, then you have probably never used alternate\n"
 "configuration files.  You should therefor leave this blank to abort.\n"),
@@ -206,8 +204,8 @@ save_config_text[] = N_(
 "as an alternate.  Leave blank to abort."),
 save_config_help[] = N_(
 "\n"
-"For various reasons, one may wish to keep different kernel\n"
+"For various reasons, one may wish to keep different configurations\n"
-"configurations available on a single machine.\n"
+"available on a single machine.\n"
 "\n"
 "Entering a file name here will allow you to later retrieve, modify\n"
 "and use the current configuration as an alternate to whatever\n"
@@ -217,8 +215,8 @@ save_config_help[] = N_(
 "leave this blank.\n"),
 search_help[] = N_(
 "\n"
-"Search for CONFIG_ symbols and display their relations.\n"
+"Search for symbols and display their relations. Regular expressions\n"
-"Regular expressions are allowed.\n"
+"are allowed.\n"
 "Example: search for \"^FOO\"\n"
 "Result:\n"
 "-----------------------------------------------------------------\n"
@@ -234,7 +232,7 @@ search_help[] = N_(
 "Selected by: BAR\n"
 "-----------------------------------------------------------------\n"
 "o The line 'Prompt:' shows the text used in the menu structure for\n"
-"  this CONFIG_ symbol\n"
+"  this symbol\n"
 "o The 'Defined at' line tell at what file / line number the symbol\n"
 "  is defined\n"
 "o The 'Depends on:' line tell what symbols needs to be defined for\n"
@@ -250,9 +248,9 @@ search_help[] = N_(
 "Only relevant lines are shown.\n"
 "\n\n"
 "Search examples:\n"
-"Examples: USB   = > find all CONFIG_ symbols containing USB\n"
+"Examples: USB   = > find all symbols containing USB\n"
-"          ^USB => find all CONFIG_ symbols starting with USB\n"
+"          ^USB => find all symbols starting with USB\n"
-"          USB$ => find all CONFIG_ symbols ending with USB\n"
+"          USB$ => find all symbols ending with USB\n"
 "\n");
 struct mitem {
@@ -635,13 +633,9 @@ static char menu_backtitle[PATH_MAX+128];
 static const char *set_config_filename(const char *config_filename)
 {
        int size;
-        struct symbol *sym;
-        sym = sym_lookup("KERNELVERSION", 0);
-        sym_calc_value(sym);
        size = snprintf(menu_backtitle, sizeof(menu_backtitle),
-                        _("%s - Linux Kernel v%s Configuration"),
+                        "%s - %s", config_filename, rootmenu.prompt->text);
-                        config_filename, sym_get_string_value(sym));
        if (size >= sizeof(menu_backtitle))
                menu_backtitle[sizeof(menu_backtitle)-1] = '\0';
@@ -662,8 +656,7 @@ static int do_exit(void)
                return 0;
        }
        res = btn_dialog(main_window,
-                        _("Do you wish to save your "
+                        _("Do you wish to save your new configuration?\n"
-                                "new kernel configuration?\n"
                                "<ESC> to cancel and resume nconfig."),
                        2,
                        "   <save>   ",
@@ -680,17 +673,15 @@ static int do_exit(void)
                if (res)
                        btn_dialog(
                                main_window,
-                                _("Error during writing of the kernel "
+                                _("Error during writing of configuration.\n"
-                                  "configuration.\n"
+                                  "Your configuration changes were NOT saved."),
-                                  "Your kernel configuration "
-                                  "changes were NOT saved."),
                                  1,
                                  "<OK>");
                break;
        default:
                btn_dialog(
                        main_window,
-                        _("Your kernel configuration changes were NOT saved."),
+                        _("Your configuration changes were NOT saved."),
                        1,
                        "<OK>");
                break;
@@ -710,8 +701,8 @@ static void search_conf(void)
 again:
        dres = dialog_inputbox(main_window,
                        _("Search Configuration Parameter"),
-                        _("Enter CONFIG_ (sub)string to search for "
+                        _("Enter " CONFIG_ " (sub)string to search for "
-                                "(with or without \"CONFIG\")"),
+                                "(with or without \"" CONFIG_ "\")"),
                        "", dialog_input_result, 99);
        switch (dres) {
        case 0:
@@ -724,10 +715,10 @@ again:
                return;
        }
-        /* strip CONFIG_ if necessary */
+        /* strip the prefix if necessary */
        dialog_input = dialog_input_result;
-        if (strncasecmp(dialog_input_result, "CONFIG_", 7) == 0)
+        if (strncasecmp(dialog_input_result, CONFIG_, strlen(CONFIG_)) == 0)
-                dialog_input += 7;
+                dialog_input += strlen(CONFIG_);
        sym_arr = sym_re_search(dialog_input);
        res = get_relations_str(sym_arr);
@@ -1235,10 +1226,12 @@ static void show_help(struct menu *menu)
        if (menu && menu->sym && menu_has_help(menu)) {
                if (menu->sym->name) {
-                        str_printf(&help, "CONFIG_%s:\n\n", menu->sym->name);
+                        str_printf(&help, "%s%s:\n\n", CONFIG_, menu->sym->name);
                        str_append(&help, _(menu_get_help(menu)));
                        str_append(&help, "\n");
                        get_symbol_str(&help, menu->sym);
+                } else {
+                        str_append(&help, _(menu_get_help(menu)));
                }
        } else {
                str_append(&help, nohelp_text);
diff --git a/scripts/kconfig/nconf.gui.c b/scripts/kconfig/nconf.gui.c
index d963071e48df..f8137b3a5382 100644
--- a/scripts/kconfig/nconf.gui.c
+++ b/scripts/kconfig/nconf.gui.c
@@ -137,7 +137,7 @@ void set_colors()
        if (has_colors()) {
                normal_color_theme();
        } else {
-                /* give deafults */
+                /* give defaults */
                no_colors_theme();
        }
 }
diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index 820df2d1217b..06dd2e33581d 100644
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
@@ -3,25 +3,42 @@
 * Released under the terms of the GNU GPL v2.0.
 */
-#include <qapplication.h>
+#include <qglobal.h>
+#if QT_VERSION < 0x040000
 #include <qmainwindow.h>
+#include <qvbox.h>
+#include <qvaluelist.h>
+#include <qtextbrowser.h>
+#include <qaction.h>
+#include <qheader.h>
+#include <qfiledialog.h>
+#include <qdragobject.h>
+#include <qpopupmenu.h>
+#else
+#include <q3mainwindow.h>
+#include <q3vbox.h>
+#include <q3valuelist.h>
+#include <q3textbrowser.h>
+#include <q3action.h>
+#include <q3header.h>
+#include <q3filedialog.h>
+#include <q3dragobject.h>
+#include <q3popupmenu.h>
+#endif
+#include <qapplication.h>
 #include <qdesktopwidget.h>
 #include <qtoolbar.h>
 #include <qlayout.h>
-#include <qvbox.h>
 #include <qsplitter.h>
-#include <qlistview.h>
-#include <qtextbrowser.h>
 #include <qlineedit.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
 #include <qmenubar.h>
 #include <qmessagebox.h>
-#include <qaction.h>
-#include <qheader.h>
-#include <qfiledialog.h>
-#include <qdragobject.h>
 #include <qregexp.h>
+#include <qevent.h>
 #include <stdlib.h>
@@ -39,7 +56,7 @@
 static QApplication *configApp;
 static ConfigSettings *configSettings;
-QAction *ConfigMainWindow::saveAction;
+Q3Action *ConfigMainWindow::saveAction;
 static inline QString qgettext(const char* str)
 {
@@ -54,9 +71,9 @@ static inline QString qgettext(const QString& str)
 /**
 * Reads a list of integer values from the application settings.
 */
-QValueList<int> ConfigSettings::readSizes(const QString& key, bool *ok)
+Q3ValueList<int> ConfigSettings::readSizes(const QString& key, bool *ok)
 {
-        QValueList<int> result;
+        Q3ValueList<int> result;
        QStringList entryList = readListEntry(key, ok);
        QStringList::Iterator it;
@@ -69,10 +86,10 @@ QValueList<int> ConfigSettings::readSizes(const QString& key, bool *ok)
 /**
 * Writes a list of integer values to the application settings.
 */
-bool ConfigSettings::writeSizes(const QString& key, const QValueList<int>& value)
+bool ConfigSettings::writeSizes(const QString& key, const Q3ValueList<int>& value)
 {
        QStringList stringList;
-        QValueList<int>::ConstIterator it;
+        Q3ValueList<int>::ConstIterator it;
        for (it = value.begin(); it != value.end(); ++it)
                stringList.push_back(QString::number(*it));
@@ -80,7 +97,6 @@ bool ConfigSettings::writeSizes(const QString& key, const QValueList<int>& value
 }
-#if QT_VERSION >= 300
 /*
 * set the new data
 * TODO check the value
@@ -91,7 +107,6 @@ void ConfigItem::okRename(int col)
        sym_set_string_value(menu->sym, text(dataColIdx).latin1());
        listView()->updateList(this);
 }
-#endif
 /*
 * update the displayed of a menu entry
@@ -195,11 +210,9 @@ void ConfigItem::updateMenu(void)
                data = sym_get_string_value(sym);
-#if QT_VERSION >= 300
                int i = list->mapIdx(dataColIdx);
                if (i >= 0)
                        setRenameEnabled(i, TRUE);
-#endif
                setText(dataColIdx, data);
                if (type == S_STRING)
                        prompt = QString("%1: %2").arg(prompt).arg(data);
@@ -432,7 +445,7 @@ void ConfigList::updateList(ConfigItem* item)
        if (!rootEntry) {
                if (mode != listMode)
                        goto update;
-                QListViewItemIterator it(this);
+                Q3ListViewItemIterator it(this);
                ConfigItem* item;
                for (; it.current(); ++it) {
@@ -527,11 +540,9 @@ void ConfigList::changeValue(ConfigItem* item)
        case S_INT:
        case S_HEX:
        case S_STRING:
-#if QT_VERSION >= 300
                if (colMap[dataColIdx] >= 0)
                        item->startRename(colMap[dataColIdx]);
                else
-#endif
                        parent()->lineEdit->show(item);
                break;
        }
@@ -563,7 +574,7 @@ void ConfigList::setParentMenu(void)
                return;
        setRootMenu(menu_get_parent_menu(rootEntry->parent));
-        QListViewItemIterator it(this);
+        Q3ListViewItemIterator it(this);
        for (; (item = (ConfigItem*)it.current()); it++) {
                if (item->menu == oldroot) {
                        setCurrentItem(item);
@@ -645,7 +656,7 @@ void ConfigList::updateMenuList(P* parent, struct menu* menu)
 void ConfigList::keyPressEvent(QKeyEvent* ev)
 {
-        QListViewItem* i = currentItem();
+        Q3ListViewItem* i = currentItem();
        ConfigItem* item;
        struct menu *menu;
        enum prop_type type;
@@ -811,10 +822,10 @@ void ConfigList::contextMenuEvent(QContextMenuEvent *e)
 {
        if (e->y() <= header()->geometry().bottom()) {
                if (!headerPopup) {
-                        QAction *action;
+                        Q3Action *action;
-                        headerPopup = new QPopupMenu(this);
+                        headerPopup = new Q3PopupMenu(this);
-                        action = new QAction(NULL, _("Show Name"), 0, this);
+                        action = new Q3Action(NULL, _("Show Name"), 0, this);
                          action->setToggleAction(TRUE);
                          connect(action, SIGNAL(toggled(bool)),
                                  parent(), SLOT(setShowName(bool)));
@@ -822,7 +833,7 @@ void ConfigList::contextMenuEvent(QContextMenuEvent *e)
                                  action, SLOT(setOn(bool)));
                          action->setOn(showName);
                          action->addTo(headerPopup);
-                        action = new QAction(NULL, _("Show Range"), 0, this);
+                        action = new Q3Action(NULL, _("Show Range"), 0, this);
                          action->setToggleAction(TRUE);
                          connect(action, SIGNAL(toggled(bool)),
                                  parent(), SLOT(setShowRange(bool)));
@@ -830,7 +841,7 @@ void ConfigList::contextMenuEvent(QContextMenuEvent *e)
                                  action, SLOT(setOn(bool)));
                          action->setOn(showRange);
                          action->addTo(headerPopup);
-                        action = new QAction(NULL, _("Show Data"), 0, this);
+                        action = new Q3Action(NULL, _("Show Data"), 0, this);
                          action->setToggleAction(TRUE);
                          connect(action, SIGNAL(toggled(bool)),
                                  parent(), SLOT(setShowData(bool)));
@@ -914,7 +925,7 @@ void ConfigView::setShowData(bool b)
 void ConfigList::setAllOpen(bool open)
 {
-        QListViewItemIterator it(this);
+        Q3ListViewItemIterator it(this);
        for (; it.current(); it++)
                it.current()->setOpen(open);
@@ -937,7 +948,7 @@ void ConfigView::updateListAll(void)
 }
 ConfigInfoView::ConfigInfoView(QWidget* parent, const char *name)
-        : Parent(parent, name), sym(0), menu(0)
+        : Parent(parent, name), sym(0), _menu(0)
 {
        if (name) {
                configSettings->beginGroup(name);
@@ -960,7 +971,7 @@ void ConfigInfoView::setShowDebug(bool b)
 {
        if (_showDebug != b) {
                _showDebug = b;
-                if (menu)
+                if (_menu)
                        menuInfo();
                else if (sym)
                        symbolInfo();
@@ -970,11 +981,11 @@ void ConfigInfoView::setShowDebug(bool b)
 void ConfigInfoView::setInfo(struct menu *m)
 {
-        if (menu == m)
+        if (_menu == m)
                return;
-        menu = m;
+        _menu = m;
        sym = NULL;
-        if (!menu)
+        if (!_menu)
                clear();
        else
                menuInfo();
@@ -1001,11 +1012,11 @@ void ConfigInfoView::menuInfo(void)
        struct symbol* sym;
        QString head, debug, help;
-        sym = menu->sym;
+        sym = _menu->sym;
        if (sym) {
-                if (menu->prompt) {
+                if (_menu->prompt) {
                        head += "<big><b>";
-                        head += print_filter(_(menu->prompt->text));
+                        head += print_filter(_(_menu->prompt->text));
                        head += "</b></big>";
                        if (sym->name) {
                                head += " (";
@@ -1031,23 +1042,23 @@ void ConfigInfoView::menuInfo(void)
                        debug = debug_info(sym);
                struct gstr help_gstr = str_new();
-                menu_get_ext_help(menu, &help_gstr);
+                menu_get_ext_help(_menu, &help_gstr);
                help = print_filter(str_get(&help_gstr));
                str_free(&help_gstr);
-        } else if (menu->prompt) {
+        } else if (_menu->prompt) {
                head += "<big><b>";
-                head += print_filter(_(menu->prompt->text));
+                head += print_filter(_(_menu->prompt->text));
                head += "</b></big><br><br>";
                if (showDebug()) {
-                        if (menu->prompt->visible.expr) {
+                        if (_menu->prompt->visible.expr) {
                                debug += "&nbsp;&nbsp;dep: ";
-                                expr_print(menu->prompt->visible.expr, expr_print_help, &debug, E_NONE);
+                                expr_print(_menu->prompt->visible.expr, expr_print_help, &debug, E_NONE);
                                debug += "<br><br>";
                        }
                }
        }
        if (showDebug())
-                debug += QString().sprintf("defined at %s:%d<br><br>", menu->file->name, menu->lineno);
+                debug += QString().sprintf("defined at %s:%d<br><br>", _menu->file->name, _menu->lineno);
        setText(head + debug + help);
 }
@@ -1150,10 +1161,10 @@ void ConfigInfoView::expr_print_help(void *data, struct symbol *sym, const char
                *text += str2;
 }
-QPopupMenu* ConfigInfoView::createPopupMenu(const QPoint& pos)
+Q3PopupMenu* ConfigInfoView::createPopupMenu(const QPoint& pos)
 {
-        QPopupMenu* popup = Parent::createPopupMenu(pos);
+        Q3PopupMenu* popup = Parent::createPopupMenu(pos);
-        QAction* action = new QAction(NULL, _("Show Debug Info"), 0, popup);
+        Q3Action* action = new Q3Action(NULL, _("Show Debug Info"), 0, popup);
          action->setToggleAction(TRUE);
          connect(action, SIGNAL(toggled(bool)), SLOT(setShowDebug(bool)));
          connect(this, SIGNAL(showDebugChanged(bool)), action, SLOT(setOn(bool)));
@@ -1210,7 +1221,7 @@ ConfigSearchWindow::ConfigSearchWindow(ConfigMainWindow* parent, const char *nam
                        y = configSettings->readNumEntry("/window y", 0, &ok);
                if (ok)
                        move(x, y);
-                QValueList<int> sizes = configSettings->readSizes("/split", &ok);
+                Q3ValueList<int> sizes = configSettings->readSizes("/split", &ok);
                if (ok)
                        split->setSizes(sizes);
                configSettings->endGroup();
@@ -1263,8 +1274,14 @@ ConfigMainWindow::ConfigMainWindow(void)
        char title[256];
        QDesktopWidget *d = configApp->desktop();
-        snprintf(title, sizeof(title), _("Linux Kernel v%s Configuration"),
+        snprintf(title, sizeof(title), "%s%s",
-                getenv("KERNELVERSION"));
+                rootmenu.prompt->text,
+#if QT_VERSION < 0x040000
+                " (Qt3)"
+#else
+                ""
+#endif
+                );
        setCaption(title);
        width = configSettings->readNumEntry("/window width", d->width() - 64);
@@ -1297,42 +1314,42 @@ ConfigMainWindow::ConfigMainWindow(void)
        configList->setFocus();
        menu = menuBar();
-        toolBar = new QToolBar("Tools", this);
+        toolBar = new Q3ToolBar("Tools", this);
-        backAction = new QAction("Back", QPixmap(xpm_back), _("Back"), 0, this);
+        backAction = new Q3Action("Back", QPixmap(xpm_back), _("Back"), 0, this);
          connect(backAction, SIGNAL(activated()), SLOT(goBack()));
          backAction->setEnabled(FALSE);
-        QAction *quitAction = new QAction("Quit", _("&Quit"), Qt::CTRL + Qt::Key_Q, this);
+        Q3Action *quitAction = new Q3Action("Quit", _("&Quit"), Qt::CTRL + Qt::Key_Q, this);
          connect(quitAction, SIGNAL(activated()), SLOT(close()));
-        QAction *loadAction = new QAction("Load", QPixmap(xpm_load), _("&Load"), Qt::CTRL + Qt::Key_L, this);
+        Q3Action *loadAction = new Q3Action("Load", QPixmap(xpm_load), _("&Load"), Qt::CTRL + Qt::Key_L, this);
          connect(loadAction, SIGNAL(activated()), SLOT(loadConfig()));
-        saveAction = new QAction("Save", QPixmap(xpm_save), _("&Save"), Qt::CTRL + Qt::Key_S, this);
+        saveAction = new Q3Action("Save", QPixmap(xpm_save), _("&Save"), Qt::CTRL + Qt::Key_S, this);
          connect(saveAction, SIGNAL(activated()), SLOT(saveConfig()));
        conf_set_changed_callback(conf_changed);
        // Set saveAction's initial state
        conf_changed();
-        QAction *saveAsAction = new QAction("Save As...", _("Save &As..."), 0, this);
+        Q3Action *saveAsAction = new Q3Action("Save As...", _("Save &As..."), 0, this);
          connect(saveAsAction, SIGNAL(activated()), SLOT(saveConfigAs()));
-        QAction *searchAction = new QAction("Find", _("&Find"), Qt::CTRL + Qt::Key_F, this);
+        Q3Action *searchAction = new Q3Action("Find", _("&Find"), Qt::CTRL + Qt::Key_F, this);
          connect(searchAction, SIGNAL(activated()), SLOT(searchConfig()));
-        QAction *singleViewAction = new QAction("Single View", QPixmap(xpm_single_view), _("Single View"), 0, this);
+        Q3Action *singleViewAction = new Q3Action("Single View", QPixmap(xpm_single_view), _("Single View"), 0, this);
          connect(singleViewAction, SIGNAL(activated()), SLOT(showSingleView()));
-        QAction *splitViewAction = new QAction("Split View", QPixmap(xpm_split_view), _("Split View"), 0, this);
+        Q3Action *splitViewAction = new Q3Action("Split View", QPixmap(xpm_split_view), _("Split View"), 0, this);
          connect(splitViewAction, SIGNAL(activated()), SLOT(showSplitView()));
-        QAction *fullViewAction = new QAction("Full View", QPixmap(xpm_tree_view), _("Full View"), 0, this);
+        Q3Action *fullViewAction = new Q3Action("Full View", QPixmap(xpm_tree_view), _("Full View"), 0, this);
          connect(fullViewAction, SIGNAL(activated()), SLOT(showFullView()));
-        QAction *showNameAction = new QAction(NULL, _("Show Name"), 0, this);
+        Q3Action *showNameAction = new Q3Action(NULL, _("Show Name"), 0, this);
          showNameAction->setToggleAction(TRUE);
          connect(showNameAction, SIGNAL(toggled(bool)), configView, SLOT(setShowName(bool)));
          connect(configView, SIGNAL(showNameChanged(bool)), showNameAction, SLOT(setOn(bool)));
          showNameAction->setOn(configView->showName());
-        QAction *showRangeAction = new QAction(NULL, _("Show Range"), 0, this);
+        Q3Action *showRangeAction = new Q3Action(NULL, _("Show Range"), 0, this);
          showRangeAction->setToggleAction(TRUE);
          connect(showRangeAction, SIGNAL(toggled(bool)), configView, SLOT(setShowRange(bool)));
          connect(configView, SIGNAL(showRangeChanged(bool)), showRangeAction, SLOT(setOn(bool)));
          showRangeAction->setOn(configList->showRange);
-        QAction *showDataAction = new QAction(NULL, _("Show Data"), 0, this);
+        Q3Action *showDataAction = new Q3Action(NULL, _("Show Data"), 0, this);
          showDataAction->setToggleAction(TRUE);
          connect(showDataAction, SIGNAL(toggled(bool)), configView, SLOT(setShowData(bool)));
          connect(configView, SIGNAL(showDataChanged(bool)), showDataAction, SLOT(setOn(bool)));
@@ -1345,9 +1362,15 @@ ConfigMainWindow::ConfigMainWindow(void)
        connect(optGroup, SIGNAL(selected(QAction *)), menuView,
                SLOT(setOptionMode(QAction *)));
-        configView->showNormalAction = new QAction(NULL, _("Show Normal Options"), 0, optGroup);
+#if QT_VERSION >= 0x040000
-        configView->showAllAction = new QAction(NULL, _("Show All Options"), 0, optGroup);
+        configView->showNormalAction = new QAction(_("Show Normal Options"), optGroup);
-        configView->showPromptAction = new QAction(NULL, _("Show Prompt Options"), 0, optGroup);
+        configView->showAllAction = new QAction(_("Show All Options"), optGroup);
+        configView->showPromptAction = new QAction(_("Show Prompt Options"), optGroup);
+#else
+        configView->showNormalAction = new QAction(_("Show Normal Options"), 0, optGroup);
+        configView->showAllAction = new QAction(_("Show All Options"), 0, optGroup);
+        configView->showPromptAction = new QAction(_("Show Prompt Options"), 0, optGroup);
+#endif
        configView->showNormalAction->setToggleAction(TRUE);
        configView->showNormalAction->setOn(configList->optMode == normalOpt);
        configView->showAllAction->setToggleAction(TRUE);
@@ -1355,15 +1378,15 @@ ConfigMainWindow::ConfigMainWindow(void)
        configView->showPromptAction->setToggleAction(TRUE);
        configView->showPromptAction->setOn(configList->optMode == promptOpt);
-        QAction *showDebugAction = new QAction(NULL, _("Show Debug Info"), 0, this);
+        Q3Action *showDebugAction = new Q3Action(NULL, _("Show Debug Info"), 0, this);
          showDebugAction->setToggleAction(TRUE);
          connect(showDebugAction, SIGNAL(toggled(bool)), helpText, SLOT(setShowDebug(bool)));
          connect(helpText, SIGNAL(showDebugChanged(bool)), showDebugAction, SLOT(setOn(bool)));
          showDebugAction->setOn(helpText->showDebug());
-        QAction *showIntroAction = new QAction(NULL, _("Introduction"), 0, this);
+        Q3Action *showIntroAction = new Q3Action(NULL, _("Introduction"), 0, this);
          connect(showIntroAction, SIGNAL(activated()), SLOT(showIntro()));
-        QAction *showAboutAction = new QAction(NULL, _("About"), 0, this);
+        Q3Action *showAboutAction = new Q3Action(NULL, _("About"), 0, this);
          connect(showAboutAction, SIGNAL(activated()), SLOT(showAbout()));
        // init tool bar
@@ -1377,7 +1400,7 @@ ConfigMainWindow::ConfigMainWindow(void)
        fullViewAction->addTo(toolBar);
        // create config menu
-        QPopupMenu* config = new QPopupMenu(this);
+        Q3PopupMenu* config = new Q3PopupMenu(this);
        menu->insertItem(_("&File"), config);
        loadAction->addTo(config);
        saveAction->addTo(config);
@@ -1386,12 +1409,12 @@ ConfigMainWindow::ConfigMainWindow(void)
        quitAction->addTo(config);
        // create edit menu
-        QPopupMenu* editMenu = new QPopupMenu(this);
+        Q3PopupMenu* editMenu = new Q3PopupMenu(this);
        menu->insertItem(_("&Edit"), editMenu);
        searchAction->addTo(editMenu);
        // create options menu
-        QPopupMenu* optionMenu = new QPopupMenu(this);
+        Q3PopupMenu* optionMenu = new Q3PopupMenu(this);
        menu->insertItem(_("&Option"), optionMenu);
        showNameAction->addTo(optionMenu);
        showRangeAction->addTo(optionMenu);
@@ -1399,10 +1422,9 @@ ConfigMainWindow::ConfigMainWindow(void)
        optionMenu->insertSeparator();
        optGroup->addTo(optionMenu);
        optionMenu->insertSeparator();
-        showDebugAction->addTo(optionMenu);
        // create help menu
-        QPopupMenu* helpMenu = new QPopupMenu(this);
+        Q3PopupMenu* helpMenu = new Q3PopupMenu(this);
        menu->insertSeparator();
        menu->insertItem(_("&Help"), helpMenu);
        showIntroAction->addTo(helpMenu);
@@ -1437,7 +1459,7 @@ ConfigMainWindow::ConfigMainWindow(void)
                showSplitView();
        // UI setup done, restore splitter positions
-        QValueList<int> sizes = configSettings->readSizes("/split1", &ok);
+        Q3ValueList<int> sizes = configSettings->readSizes("/split1", &ok);
        if (ok)
                split1->setSizes(sizes);
@@ -1448,7 +1470,7 @@ ConfigMainWindow::ConfigMainWindow(void)
 void ConfigMainWindow::loadConfig(void)
 {
-        QString s = QFileDialog::getOpenFileName(conf_get_configname(), NULL, this);
+        QString s = Q3FileDialog::getOpenFileName(conf_get_configname(), NULL, this);
        if (s.isNull())
                return;
        if (conf_read(QFile::encodeName(s)))
@@ -1464,7 +1486,7 @@ void ConfigMainWindow::saveConfig(void)
 void ConfigMainWindow::saveConfigAs(void)
 {
-        QString s = QFileDialog::getSaveFileName(conf_get_configname(), NULL, this);
+        QString s = Q3FileDialog::getSaveFileName(conf_get_configname(), NULL, this);
        if (s.isNull())
                return;
        if (conf_write(QFile::encodeName(s)))
@@ -1633,7 +1655,7 @@ void ConfigMainWindow::closeEvent(QCloseEvent* e)
 void ConfigMainWindow::showIntro(void)
 {
-        static const QString str = _("Welcome to the qconf graphical kernel configuration tool for Linux.\n\n"
+        static const QString str = _("Welcome to the qconf graphical configuration tool.\n\n"
                "For each option, a blank box indicates the feature is disabled, a check\n"
                "indicates it is enabled, and a dot indicates that it is to be compiled\n"
                "as a module.  Clicking on the box will cycle through the three states.\n\n"
diff --git a/scripts/kconfig/qconf.h b/scripts/kconfig/qconf.h
index 636a74b23bf9..91677d900dbd 100644
--- a/scripts/kconfig/qconf.h
+++ b/scripts/kconfig/qconf.h
@@ -3,26 +3,25 @@
 * Released under the terms of the GNU GPL v2.0.
 */
+#if QT_VERSION < 0x040000
 #include <qlistview.h>
-#if QT_VERSION >= 300
-#include <qsettings.h>
 #else
-class QSettings {
+#include <q3listview.h>
-public:
+#endif
-        void beginGroup(const QString& group) { }
+#include <qsettings.h>
-        void endGroup(void) { }
-        bool readBoolEntry(const QString& key, bool def = FALSE, bool* ok = 0) const
+#if QT_VERSION < 0x040000
-        { if (ok) *ok = FALSE; return def; }
+#define Q3ValueList             QValueList
-        int readNumEntry(const QString& key, int def = 0, bool* ok = 0) const
+#define Q3PopupMenu             QPopupMenu
-        { if (ok) *ok = FALSE; return def; }
+#define Q3ListView              QListView
-        QString readEntry(const QString& key, const QString& def = QString::null, bool* ok = 0) const
+#define Q3ListViewItem          QListViewItem
-        { if (ok) *ok = FALSE; return def; }
+#define Q3VBox                  QVBox
-        QStringList readListEntry(const QString& key, bool* ok = 0) const
+#define Q3TextBrowser           QTextBrowser
-        { if (ok) *ok = FALSE; return QStringList(); }
+#define Q3MainWindow            QMainWindow
-        template <class t>
+#define Q3Action                QAction
-        bool writeEntry(const QString& key, t value)
+#define Q3ToolBar               QToolBar
-        { return TRUE; }
+#define Q3ListViewItemIterator  QListViewItemIterator
-};
+#define Q3FileDialog            QFileDialog
 #endif
 class ConfigView;
@@ -31,11 +30,10 @@ class ConfigItem;
 class ConfigLineEdit;
 class ConfigMainWindow;
 class ConfigSettings : public QSettings {
 public:
-        QValueList<int> readSizes(const QString& key, bool *ok);
+        Q3ValueList<int> readSizes(const QString& key, bool *ok);
-        bool writeSizes(const QString& key, const QValueList<int>& value);
+        bool writeSizes(const QString& key, const Q3ValueList<int>& value);
 };
 enum colIdx {
@@ -48,9 +46,9 @@ enum optionMode {
        normalOpt = 0, allOpt, promptOpt
 };
-class ConfigList : public QListView {
+class ConfigList : public Q3ListView {
        Q_OBJECT
-        typedef class QListView Parent;
+        typedef class Q3ListView Parent;
 public:
        ConfigList(ConfigView* p, const char *name = 0);
        void reinit(void);
@@ -135,17 +133,17 @@ public:
        struct menu *rootEntry;
        QColorGroup disabledColorGroup;
        QColorGroup inactivedColorGroup;
-        QPopupMenu* headerPopup;
+        Q3PopupMenu* headerPopup;
 private:
        int colMap[colNr];
        int colRevMap[colNr];
 };
-class ConfigItem : public QListViewItem {
+class ConfigItem : public Q3ListViewItem {
-        typedef class QListViewItem Parent;
+        typedef class Q3ListViewItem Parent;
 public:
-        ConfigItem(QListView *parent, ConfigItem *after, struct menu *m, bool v)
+        ConfigItem(Q3ListView *parent, ConfigItem *after, struct menu *m, bool v)
        : Parent(parent, after), menu(m), visible(v), goParent(false)
        {
                init();
@@ -155,16 +153,14 @@ public:
        {
                init();
        }
-        ConfigItem(QListView *parent, ConfigItem *after, bool v)
+        ConfigItem(Q3ListView *parent, ConfigItem *after, bool v)
        : Parent(parent, after), menu(0), visible(v), goParent(true)
        {
                init();
        }
        ~ConfigItem(void);
        void init(void);
-#if QT_VERSION >= 300
        void okRename(int col);
-#endif
        void updateMenu(void);
        void testUpdateMenu(bool v);
        ConfigList* listView() const
@@ -219,9 +215,9 @@ public:
        ConfigItem *item;
 };
-class ConfigView : public QVBox {
+class ConfigView : public Q3VBox {
        Q_OBJECT
-        typedef class QVBox Parent;
+        typedef class Q3VBox Parent;
 public:
        ConfigView(QWidget* parent, const char *name = 0);
        ~ConfigView(void);
@@ -252,9 +248,9 @@ public:
        static QAction *showPromptAction;
 };
-class ConfigInfoView : public QTextBrowser {
+class ConfigInfoView : public Q3TextBrowser {
        Q_OBJECT
-        typedef class QTextBrowser Parent;
+        typedef class Q3TextBrowser Parent;
 public:
        ConfigInfoView(QWidget* parent, const char *name = 0);
        bool showDebug(void) const { return _showDebug; }
@@ -274,11 +270,11 @@ protected:
        QString debug_info(struct symbol *sym);
        static QString print_filter(const QString &str);
        static void expr_print_help(void *data, struct symbol *sym, const char *str);
-        QPopupMenu* createPopupMenu(const QPoint& pos);
+        Q3PopupMenu* createPopupMenu(const QPoint& pos);
        void contentsContextMenuEvent(QContextMenuEvent *e);
        struct symbol *sym;
-        struct menu *menu;
+        struct menu *_menu;
        bool _showDebug;
 };
@@ -302,10 +298,10 @@ protected:
        struct symbol **result;
 };
-class ConfigMainWindow : public QMainWindow {
+class ConfigMainWindow : public Q3MainWindow {
        Q_OBJECT
-        static QAction *saveAction;
+        static Q3Action *saveAction;
        static void conf_changed(void);
 public:
        ConfigMainWindow(void);
@@ -334,8 +330,8 @@ protected:
        ConfigView *configView;
        ConfigList *configList;
        ConfigInfoView *helpText;
-        QToolBar *toolBar;
+        Q3ToolBar *toolBar;
-        QAction *backAction;
+        Q3Action *backAction;
        QSplitter* split1;
        QSplitter* split2;
 };
diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
index 943712ca6c0a..c0efe102d655 100644
--- a/scripts/kconfig/symbol.c
+++ b/scripts/kconfig/symbol.c
@@ -840,6 +840,55 @@ struct symbol *sym_find(const char *name)
        return symbol;
 }
+/*
+ * Expand symbol's names embedded in the string given in argument. Symbols'
+ * name to be expanded shall be prefixed by a '$'. Unknown symbol expands to
+ * the empty string.
+ */
+const char *sym_expand_string_value(const char *in)
+{
+        const char *src;
+        char *res;
+        size_t reslen;
+        reslen = strlen(in) + 1;
+        res = malloc(reslen);
+        res[0] = '\0';
+        while ((src = strchr(in, '$'))) {
+                char *p, name[SYMBOL_MAXLENGTH];
+                const char *symval = "";
+                struct symbol *sym;
+                size_t newlen;
+                strncat(res, in, src - in);
+                src++;
+                p = name;
+                while (isalnum(*src) || *src == '_')
+                        *p++ = *src++;
+                *p = '\0';
+                sym = sym_find(name);
+                if (sym != NULL) {
+                        sym_calc_value(sym);
+                        symval = sym_get_string_value(sym);
+                }
+                newlen = strlen(res) + strlen(symval) + strlen(src);
+                if (newlen > reslen) {
+                        reslen = newlen;
+                        res = realloc(res, reslen);
+                }
+                strcat(res, symval);
+                in = src;
+        }
+        strcat(res, in);
+        return res;
+}
 struct symbol **sym_re_search(const char *pattern)
 {
        struct symbol *sym, **sym_arr = NULL;
diff --git a/scripts/kconfig/util.c b/scripts/kconfig/util.c
index 78b5c04e736b..6330cc871a47 100644
--- a/scripts/kconfig/util.c
+++ b/scripts/kconfig/util.c
@@ -12,15 +12,18 @@
 struct file *file_lookup(const char *name)
 {
        struct file *file;
+        const char *file_name = sym_expand_string_value(name);
        for (file = file_list; file; file = file->next) {
-                if (!strcmp(name, file->name))
+                if (!strcmp(name, file->name)) {
+                        free((void *)file_name);
                        return file;
+                }
        }
        file = malloc(sizeof(*file));
        memset(file, 0, sizeof(*file));
-        file->name = strdup(name);
+        file->name = file_name;
        file->next = file_list;
        file_list = file;
        return file;
diff --git a/scripts/kconfig/zconf.l b/scripts/kconfig/zconf.l
index d8f7236cb0a3..3dbaec185cc4 100644
--- a/scripts/kconfig/zconf.l
+++ b/scripts/kconfig/zconf.l
@@ -304,9 +304,10 @@ void zconf_nextfile(const char *name)
        memset(buf, 0, sizeof(*buf));
        current_buf->state = YY_CURRENT_BUFFER;
-        yyin = zconf_fopen(name);
+        yyin = zconf_fopen(file->name);
        if (!yyin) {
-                printf("%s:%d: can't open file \"%s\"\n", zconf_curname(), zconf_lineno(), name);
+                printf("%s:%d: can't open file \"%s\"\n",
+                    zconf_curname(), zconf_lineno(), file->name);
                exit(1);
        }
        yy_switch_to_buffer(yy_create_buffer(yyin, YY_BUF_SIZE));
@@ -353,7 +354,7 @@ int zconf_lineno(void)
        return current_pos.lineno;
 }
-char *zconf_curname(void)
+const char *zconf_curname(void)
 {
        return current_pos.file ? current_pos.file->name : "<none>";
 }
diff --git a/scripts/kconfig/zconf.tab.c_shipped b/scripts/kconfig/zconf.tab.c_shipped
index 32a9eefd842c..699d4b265186 100644
--- a/scripts/kconfig/zconf.tab.c_shipped
+++ b/scripts/kconfig/zconf.tab.c_shipped
@@ -417,18 +417,18 @@ union yyalloc
 #endif
 /* YYFINAL -- State number of the termination state.  */
-#define YYFINAL  3
+#define YYFINAL  11
 /* YYLAST -- Last index in YYTABLE.  */
-#define YYLAST   259
+#define YYLAST   277
 /* YYNTOKENS -- Number of terminals.  */
 #define YYNTOKENS  35
 /* YYNNTS -- Number of nonterminals.  */
-#define YYNNTS  46
+#define YYNNTS  48
 /* YYNRULES -- Number of rules.  */
-#define YYNRULES  110
+#define YYNRULES  113
 /* YYNRULES -- Number of states.  */
-#define YYNSTATES  180
+#define YYNSTATES  185
 /* YYTRANSLATE(YYLEX) -- Bison symbol number corresponding to YYLEX.  */
 #define YYUNDEFTOK  2
@@ -476,73 +476,74 @@ static const yytype_uint8 yytranslate[] =
   YYRHS.  */
 static const yytype_uint16 yyprhs[] =
 {
-       0,     0,     3,     5,     6,     9,    12,    15,    20,    23,
+       0,     0,     3,     6,     8,    11,    13,    14,    17,    20,
-      28,    33,    37,    39,    41,    43,    45,    47,    49,    51,
+      23,    26,    31,    36,    40,    42,    44,    46,    48,    50,
-      53,    55,    57,    59,    61,    63,    67,    70,    74,    77,
+      52,    54,    56,    58,    60,    62,    64,    66,    70,    73,
-      81,    84,    85,    88,    91,    94,    97,   100,   103,   107,
+      77,    80,    84,    87,    88,    91,    94,    97,   100,   103,
-     112,   117,   122,   128,   132,   133,   137,   138,   141,   145,
+     106,   110,   115,   120,   125,   131,   135,   136,   140,   141,
-     148,   150,   154,   155,   158,   161,   164,   167,   170,   175,
+     144,   148,   151,   153,   157,   158,   161,   164,   167,   170,
-     179,   182,   187,   188,   191,   195,   197,   201,   202,   205,
+     173,   178,   182,   185,   190,   191,   194,   198,   200,   204,
-     208,   211,   215,   218,   220,   224,   225,   228,   231,   234,
+     205,   208,   211,   214,   218,   222,   225,   227,   231,   232,
-     238,   242,   245,   248,   251,   252,   255,   258,   261,   266,
+     235,   238,   241,   245,   249,   252,   255,   258,   259,   262,
-     267,   270,   272,   274,   277,   280,   283,   285,   288,   289,
+     265,   268,   273,   274,   277,   279,   281,   284,   287,   290,
-     292,   294,   298,   302,   306,   309,   313,   317,   319,   321,
+     292,   295,   296,   299,   301,   305,   309,   313,   316,   320,
-     322
+     324,   326,   328,   329
 };
 /* YYRHS -- A `-1'-separated list of the rules' RHS.  */
 static const yytype_int8 yyrhs[] =
 {
-      36,     0,    -1,    37,    -1,    -1,    37,    39,    -1,    37,
+      36,     0,    -1,    78,    37,    -1,    37,    -1,    62,    38,
-      53,    -1,    37,    64,    -1,    37,     3,    74,    76,    -1,
+      -1,    38,    -1,    -1,    38,    40,    -1,    38,    54,    -1,
-      37,    75,    -1,    37,    25,     1,    30,    -1,    37,    38,
+      38,    66,    -1,    38,    77,    -1,    38,    25,     1,    30,
-       1,    30,    -1,    37,     1,    30,    -1,    16,    -1,    18,
+      -1,    38,    39,     1,    30,    -1,    38,     1,    30,    -1,
-      -1,    19,    -1,    21,    -1,    17,    -1,    22,    -1,    20,
+      16,    -1,    18,    -1,    19,    -1,    21,    -1,    17,    -1,
-      -1,    30,    -1,    59,    -1,    68,    -1,    42,    -1,    44,
+      22,    -1,    20,    -1,    30,    -1,    60,    -1,    70,    -1,
-      -1,    66,    -1,    25,     1,    30,    -1,     1,    30,    -1,
+      43,    -1,    45,    -1,    68,    -1,    25,     1,    30,    -1,
-      10,    25,    30,    -1,    41,    45,    -1,    11,    25,    30,
+       1,    30,    -1,    10,    25,    30,    -1,    42,    46,    -1,
-      -1,    43,    45,    -1,    -1,    45,    46,    -1,    45,    47,
+      11,    25,    30,    -1,    44,    46,    -1,    -1,    46,    47,
-      -1,    45,    72,    -1,    45,    70,    -1,    45,    40,    -1,
+      -1,    46,    48,    -1,    46,    74,    -1,    46,    72,    -1,
-      45,    30,    -1,    19,    73,    30,    -1,    18,    74,    77,
+      46,    41,    -1,    46,    30,    -1,    19,    75,    30,    -1,
-      30,    -1,    20,    78,    77,    30,    -1,    21,    25,    77,
+      18,    76,    79,    30,    -1,    20,    80,    79,    30,    -1,
-      30,    -1,    22,    79,    79,    77,    30,    -1,    23,    48,
+      21,    25,    79,    30,    -1,    22,    81,    81,    79,    30,
-      30,    -1,    -1,    48,    25,    49,    -1,    -1,    33,    74,
+      -1,    23,    49,    30,    -1,    -1,    49,    25,    50,    -1,
-      -1,     7,    80,    30,    -1,    50,    54,    -1,    75,    -1,
+      -1,    33,    76,    -1,     7,    82,    30,    -1,    51,    55,
-      51,    56,    52,    -1,    -1,    54,    55,    -1,    54,    72,
+      -1,    77,    -1,    52,    57,    53,    -1,    -1,    55,    56,
-      -1,    54,    70,    -1,    54,    30,    -1,    54,    40,    -1,
+      -1,    55,    74,    -1,    55,    72,    -1,    55,    30,    -1,
-      18,    74,    77,    30,    -1,    19,    73,    30,    -1,    17,
+      55,    41,    -1,    18,    76,    79,    30,    -1,    19,    75,
-      30,    -1,    20,    25,    77,    30,    -1,    -1,    56,    39,
+      30,    -1,    17,    30,    -1,    20,    25,    79,    30,    -1,
-      -1,    14,    78,    76,    -1,    75,    -1,    57,    60,    58,
+      -1,    57,    40,    -1,    14,    80,    78,    -1,    77,    -1,
-      -1,    -1,    60,    39,    -1,    60,    64,    -1,    60,    53,
+      58,    61,    59,    -1,    -1,    61,    40,    -1,    61,    66,
-      -1,     4,    74,    30,    -1,    61,    71,    -1,    75,    -1,
+      -1,    61,    54,    -1,     3,    76,    78,    -1,     4,    76,
-      62,    65,    63,    -1,    -1,    65,    39,    -1,    65,    64,
+      30,    -1,    63,    73,    -1,    77,    -1,    64,    67,    65,
-      -1,    65,    53,    -1,     6,    74,    30,    -1,     9,    74,
+      -1,    -1,    67,    40,    -1,    67,    66,    -1,    67,    54,
-      30,    -1,    67,    71,    -1,    12,    30,    -1,    69,    13,
+      -1,     6,    76,    30,    -1,     9,    76,    30,    -1,    69,
-      -1,    -1,    71,    72,    -1,    71,    30,    -1,    71,    40,
+      73,    -1,    12,    30,    -1,    71,    13,    -1,    -1,    73,
-      -1,    16,    24,    78,    30,    -1,    -1,    74,    77,    -1,
+      74,    -1,    73,    30,    -1,    73,    41,    -1,    16,    24,
-      25,    -1,    26,    -1,     5,    30,    -1,     8,    30,    -1,
+      80,    30,    -1,    -1,    76,    79,    -1,    25,    -1,    26,
-      15,    30,    -1,    30,    -1,    76,    30,    -1,    -1,    14,
+      -1,     5,    30,    -1,     8,    30,    -1,    15,    30,    -1,
-      78,    -1,    79,    -1,    79,    33,    79,    -1,    79,    27,
+      30,    -1,    78,    30,    -1,    -1,    14,    80,    -1,    81,
-      79,    -1,    29,    78,    28,    -1,    34,    78,    -1,    78,
+      -1,    81,    33,    81,    -1,    81,    27,    81,    -1,    29,
-      31,    78,    -1,    78,    32,    78,    -1,    25,    -1,    26,
+      80,    28,    -1,    34,    80,    -1,    80,    31,    80,    -1,
-      -1,    -1,    25,    -1
+      80,    32,    80,    -1,    25,    -1,    26,    -1,    -1,    25,
+      -1
 };
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,   107,   107,   109,   111,   112,   113,   114,   115,   116,
+       0,   107,   107,   107,   109,   109,   111,   113,   114,   115,
-     117,   121,   125,   125,   125,   125,   125,   125,   125,   129,
+     116,   117,   118,   122,   126,   126,   126,   126,   126,   126,
-     130,   131,   132,   133,   134,   138,   139,   145,   153,   159,
+     126,   130,   131,   132,   133,   134,   135,   139,   140,   146,
-     167,   177,   179,   180,   181,   182,   183,   184,   187,   195,
+     154,   160,   168,   178,   180,   181,   182,   183,   184,   185,
-     201,   211,   217,   223,   226,   228,   239,   240,   245,   254,
+     188,   196,   202,   212,   218,   224,   227,   229,   240,   241,
-     259,   267,   270,   272,   273,   274,   275,   276,   279,   285,
+     246,   255,   260,   268,   271,   273,   274,   275,   276,   277,
-     296,   302,   312,   314,   319,   327,   335,   338,   340,   341,
+     280,   286,   297,   303,   313,   315,   320,   328,   336,   339,
-     342,   347,   354,   359,   367,   370,   372,   373,   374,   377,
+     341,   342,   343,   348,   355,   362,   367,   375,   378,   380,
-     385,   392,   399,   405,   412,   414,   415,   416,   419,   427,
+     381,   382,   385,   393,   400,   407,   413,   420,   422,   423,
-     429,   434,   435,   438,   439,   440,   444,   445,   448,   449,
+     424,   427,   435,   437,   442,   443,   446,   447,   448,   452,
-     452,   453,   454,   455,   456,   457,   458,   461,   462,   465,
+     453,   456,   457,   460,   461,   462,   463,   464,   465,   466,
-     466
+     469,   470,   473,   474
 };
 #endif
@@ -557,17 +558,17 @@ static const char *const yytname[] =
  "T_OPTIONAL", "T_PROMPT", "T_TYPE", "T_DEFAULT", "T_SELECT", "T_RANGE",
  "T_OPTION", "T_ON", "T_WORD", "T_WORD_QUOTE", "T_UNEQUAL",
  "T_CLOSE_PAREN", "T_OPEN_PAREN", "T_EOL", "T_OR", "T_AND", "T_EQUAL",
-  "T_NOT", "$accept", "input", "stmt_list", "option_name", "common_stmt",
+  "T_NOT", "$accept", "input", "start", "stmt_list", "option_name",
-  "option_error", "config_entry_start", "config_stmt",
+  "common_stmt", "option_error", "config_entry_start", "config_stmt",
  "menuconfig_entry_start", "menuconfig_stmt", "config_option_list",
  "config_option", "symbol_option", "symbol_option_list",
  "symbol_option_arg", "choice", "choice_entry", "choice_end",
  "choice_stmt", "choice_option_list", "choice_option", "choice_block",
-  "if_entry", "if_end", "if_stmt", "if_block", "menu", "menu_entry",
+  "if_entry", "if_end", "if_stmt", "if_block", "mainmenu_stmt", "menu",
-  "menu_end", "menu_stmt", "menu_block", "source_stmt", "comment",
+  "menu_entry", "menu_end", "menu_stmt", "menu_block", "source_stmt",
-  "comment_stmt", "help_start", "help", "depends_list", "depends",
+  "comment", "comment_stmt", "help_start", "help", "depends_list",
-  "prompt_stmt_opt", "prompt", "end", "nl", "if_expr", "expr", "symbol",
+  "depends", "prompt_stmt_opt", "prompt", "end", "nl", "if_expr", "expr",
-  "word_opt", 0
+  "symbol", "word_opt", 0
 };
 #endif
@@ -586,35 +587,35 @@ static const yytype_uint16 yytoknum[] =
 /* YYR1[YYN] -- Symbol number of symbol that rule YYN derives.  */
 static const yytype_uint8 yyr1[] =
 {
-       0,    35,    36,    37,    37,    37,    37,    37,    37,    37,
+       0,    35,    36,    36,    37,    37,    38,    38,    38,    38,
-      37,    37,    38,    38,    38,    38,    38,    38,    38,    39,
+      38,    38,    38,    38,    39,    39,    39,    39,    39,    39,
-      39,    39,    39,    39,    39,    40,    40,    41,    42,    43,
+      39,    40,    40,    40,    40,    40,    40,    41,    41,    42,
-      44,    45,    45,    45,    45,    45,    45,    45,    46,    46,
+      43,    44,    45,    46,    46,    46,    46,    46,    46,    46,
-      46,    46,    46,    47,    48,    48,    49,    49,    50,    51,
+      47,    47,    47,    47,    47,    48,    49,    49,    50,    50,
-      52,    53,    54,    54,    54,    54,    54,    54,    55,    55,
+      51,    52,    53,    54,    55,    55,    55,    55,    55,    55,
-      55,    55,    56,    56,    57,    58,    59,    60,    60,    60,
+      56,    56,    56,    56,    57,    57,    58,    59,    60,    61,
-      60,    61,    62,    63,    64,    65,    65,    65,    65,    66,
+      61,    61,    61,    62,    63,    64,    65,    66,    67,    67,
-      67,    68,    69,    70,    71,    71,    71,    71,    72,    73,
+      67,    67,    68,    69,    70,    71,    72,    73,    73,    73,
-      73,    74,    74,    75,    75,    75,    76,    76,    77,    77,
+      73,    74,    75,    75,    76,    76,    77,    77,    77,    78,
-      78,    78,    78,    78,    78,    78,    78,    79,    79,    80,
+      78,    79,    79,    80,    80,    80,    80,    80,    80,    80,
-      80
+      81,    81,    82,    82
 };
 /* YYR2[YYN] -- Number of symbols composing right hand side of rule YYN.  */
 static const yytype_uint8 yyr2[] =
 {
-       0,     2,     1,     0,     2,     2,     2,     4,     2,     4,
+       0,     2,     2,     1,     2,     1,     0,     2,     2,     2,
-       4,     3,     1,     1,     1,     1,     1,     1,     1,     1,
+       2,     4,     4,     3,     1,     1,     1,     1,     1,     1,
-       1,     1,     1,     1,     1,     3,     2,     3,     2,     3,
+       1,     1,     1,     1,     1,     1,     1,     3,     2,     3,
-       2,     0,     2,     2,     2,     2,     2,     2,     3,     4,
+       2,     3,     2,     0,     2,     2,     2,     2,     2,     2,
-       4,     4,     5,     3,     0,     3,     0,     2,     3,     2,
+       3,     4,     4,     4,     5,     3,     0,     3,     0,     2,
-       1,     3,     0,     2,     2,     2,     2,     2,     4,     3,
+       3,     2,     1,     3,     0,     2,     2,     2,     2,     2,
-       2,     4,     0,     2,     3,     1,     3,     0,     2,     2,
+       4,     3,     2,     4,     0,     2,     3,     1,     3,     0,
-       2,     3,     2,     1,     3,     0,     2,     2,     2,     3,
+       2,     2,     2,     3,     3,     2,     1,     3,     0,     2,
-       3,     2,     2,     2,     0,     2,     2,     2,     4,     0,
+       2,     2,     3,     3,     2,     2,     2,     0,     2,     2,
-       2,     1,     1,     2,     2,     2,     1,     2,     0,     2,
+       2,     4,     0,     2,     1,     1,     2,     2,     2,     1,
-       1,     3,     3,     3,     2,     3,     3,     1,     1,     0,
+       2,     0,     2,     1,     3,     3,     3,     2,     3,     3,
-       1
+       1,     1,     0,     1
 };
 /* YYDEFACT[STATE-NAME] -- Default rule to reduce with in state
@@ -622,158 +623,165 @@ static const yytype_uint8 yyr2[] =
   means the default is an error.  */
 static const yytype_uint8 yydefact[] =
 {
-       3,     0,     0,     1,     0,     0,     0,     0,     0,   109,
+       6,     0,    99,     0,     3,     0,     6,     6,    94,    95,
-       0,     0,     0,     0,     0,     0,    12,    16,    13,    14,
+       0,     1,     0,     0,     0,     0,   112,     0,     0,     0,
-      18,    15,    17,     0,    19,     0,     4,    31,    22,    31,
+       0,     0,     0,    14,    18,    15,    16,    20,    17,    19,
-      23,    52,    62,     5,    67,    20,    84,    75,     6,    24,
+       0,    21,     0,     7,    33,    24,    33,    25,    54,    64,
-      84,    21,     8,    11,    91,    92,     0,     0,    93,     0,
+       8,    69,    22,    87,    78,     9,    26,    87,    23,    10,
-     110,     0,    94,     0,     0,     0,   107,   108,     0,     0,
+       0,   100,     2,    73,    13,     0,    96,     0,   113,     0,
-       0,   100,    95,     0,     0,     0,     0,     0,     0,     0,
+      97,     0,     0,     0,   110,   111,     0,     0,     0,   103,
-       0,     0,     0,    96,     7,    71,    79,    48,    80,    27,
+      98,     0,     0,     0,     0,     0,     0,     0,     0,     0,
-      29,     0,   104,     0,     0,    64,     0,     0,     9,    10,
+       0,    74,    82,    50,    83,    29,    31,     0,   107,     0,
-       0,     0,     0,     0,    89,     0,     0,     0,    44,     0,
+       0,    66,     0,     0,    11,    12,     0,     0,     0,     0,
-      37,    36,    32,    33,     0,    35,    34,     0,     0,    89,
+      92,     0,     0,     0,    46,     0,    39,    38,    34,    35,
-       0,    56,    57,    53,    55,    54,    63,    51,    50,    68,
+       0,    37,    36,     0,     0,    92,     0,    58,    59,    55,
-      70,    66,    69,    65,    86,    87,    85,    76,    78,    74,
+      57,    56,    65,    53,    52,    70,    72,    68,    71,    67,
-      77,    73,    97,   103,   105,   106,   102,   101,    26,    82,
+      89,    90,    88,    79,    81,    77,    80,    76,   106,   108,
-       0,    98,     0,    98,    98,    98,     0,     0,     0,    83,
+     109,   105,   104,    28,    85,     0,   101,     0,   101,   101,
-      60,    98,     0,    98,     0,     0,     0,    38,    90,     0,
+     101,     0,     0,     0,    86,    62,   101,     0,   101,     0,
-       0,    98,    46,    43,    25,     0,    59,     0,    88,    99,
+       0,     0,    40,    93,     0,     0,   101,    48,    45,    27,
-      39,    40,    41,     0,     0,    45,    58,    61,    42,    47
+       0,    61,     0,    91,   102,    41,    42,    43,     0,     0,
+      47,    60,    63,    44,    49
 };
 /* YYDEFGOTO[NTERM-NUM].  */
 static const yytype_int16 yydefgoto[] =
 {
-      -1,     1,     2,    25,    26,   101,    27,    28,    29,    30,
+      -1,     3,     4,     5,    32,    33,   107,    34,    35,    36,
-      65,   102,   103,   147,   175,    31,    32,   117,    33,    67,
+      37,    73,   108,   109,   152,   180,    38,    39,   123,    40,
-     113,    68,    34,   121,    35,    69,    36,    37,   129,    38,
+      75,   119,    76,    41,   127,    42,    77,     6,    43,    44,
-      71,    39,    40,    41,   104,   105,    70,   106,   142,   143,
+     135,    45,    79,    46,    47,    48,   110,   111,    78,   112,
-      42,    74,   156,    60,    61,    51
+     147,   148,    49,     7,   161,    68,    69,    59
 };
 /* YYPACT[STATE-NUM] -- Index in YYTABLE of the portion describing
   STATE-NUM.  */
-#define YYPACT_NINF -80
+#define YYPACT_NINF -89
 static const yytype_int16 yypact[] =
 {
-     -80,     2,   132,   -80,   -13,    -1,    -1,    -2,    -1,     9,
+       3,     4,   -89,    20,   -89,   100,   -89,     7,   -89,   -89,
-      33,    -1,    27,    40,    -3,    38,   -80,   -80,   -80,   -80,
+      -8,   -89,    17,     4,    28,     4,    37,    36,     4,    68,
-     -80,   -80,   -80,    71,   -80,    77,   -80,   -80,   -80,   -80,
+      87,   -18,    69,   -89,   -89,   -89,   -89,   -89,   -89,   -89,
-     -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
+     128,   -89,   138,   -89,   -89,   -89,   -89,   -89,   -89,   -89,
-     -80,   -80,   -80,   -80,   -80,   -80,    57,    61,   -80,    63,
+     -89,   -89,   -89,   -89,   -89,   -89,   -89,   -89,   -89,   -89,
-     -80,    76,   -80,    87,   101,   133,   -80,   -80,    -3,    -3,
+     127,   -89,   -89,   110,   -89,   126,   -89,   136,   -89,   137,
-     195,    -6,   -80,   136,   149,    39,   104,    65,   150,     5,
+     -89,   147,   150,   152,   -89,   -89,   -18,   -18,   171,   -14,
-     194,     5,   167,   -80,   176,   -80,   -80,   -80,   -80,   -80,
+     -89,   153,   157,    34,    67,   180,   233,   220,   207,   220,
-     -80,    68,   -80,    -3,    -3,   176,    72,    72,   -80,   -80,
+     154,   -89,   -89,   -89,   -89,   -89,   -89,     0,   -89,   -18,
-     177,   187,    78,    -1,    -1,    -3,   196,    72,   -80,   222,
+     -18,   110,    44,    44,   -89,   -89,   163,   174,   182,     4,
-     -80,   -80,   -80,   -80,   221,   -80,   -80,   205,    -1,    -1,
+       4,   -18,   194,    44,   -89,   219,   -89,   -89,   -89,   -89,
-     211,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
+     223,   -89,   -89,   203,     4,     4,   215,   -89,   -89,   -89,
-     -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,
+     -89,   -89,   -89,   -89,   -89,   -89,   -89,   -89,   -89,   -89,
-     -80,   -80,   -80,   -80,   206,   -80,   -80,   -80,   -80,   -80,
+     -89,   -89,   -89,   -89,   -89,   -89,   -89,   -89,   -89,   213,
-      -3,   223,   209,   223,   197,   223,    72,     7,   210,   -80,
+     -89,   -89,   -89,   -89,   -89,   -18,   232,   227,   232,    -5,
-     -80,   223,   212,   223,   201,    -3,   213,   -80,   -80,   214,
+     232,    44,    35,   234,   -89,   -89,   232,   235,   232,   224,
-     215,   223,   208,   -80,   -80,   216,   -80,   217,   -80,   113,
+     -18,   236,   -89,   -89,   237,   238,   232,   216,   -89,   -89,
-     -80,   -80,   -80,   218,    -1,   -80,   -80,   -80,   -80,   -80
+     240,   -89,   241,   -89,    71,   -89,   -89,   -89,   242,     4,
+     -89,   -89,   -89,   -89,   -89
 };
 /* YYPGOTO[NTERM-NUM].  */
 static const yytype_int16 yypgoto[] =
 {
-     -80,   -80,   -80,   -80,   122,   -34,   -80,   -80,   -80,   -80,
+     -89,   -89,   255,   267,   -89,    47,   -57,   -89,   -89,   -89,
-     220,   -80,   -80,   -80,   -80,   -80,   -80,   -80,    59,   -80,
+     -89,   239,   -89,   -89,   -89,   -89,   -89,   -89,   -89,   130,
-     -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   -80,   125,
+     -89,   -89,   -89,   -89,   -89,   -89,   -89,   -89,   -89,   -89,
-     -80,   -80,   -80,   -80,   -80,   183,   219,    22,   142,    -5,
+     -89,   181,   -89,   -89,   -89,   -89,   -89,   199,   229,    16,
-     147,   192,    69,   -54,   -79,   -80
+     162,    -1,    74,    -7,   103,   -65,   -88,   -89
 };
 /* YYTABLE[YYPACT[STATE-NUM]].  What to do in state STATE-NUM.  If
   positive, shift that token.  If negative, reduce the rule which
   number is the opposite.  If zero, do what YYDEFACT says.
   If YYTABLE_NINF, syntax error.  */
-#define YYTABLE_NINF -82
+#define YYTABLE_NINF -85
 static const yytype_int16 yytable[] =
 {
-      46,    47,     3,    49,    81,    82,    53,   136,   137,     6,
+      10,    87,    88,    53,   141,   142,     1,    64,    65,   160,
-       7,     8,     9,    10,    11,    12,    13,    43,   146,    14,
+       1,    66,    55,    92,    57,   151,    67,    61,   118,    93,
-      15,    86,    56,    57,    44,    45,    58,    87,    48,   134,
+      11,   131,     2,   131,   139,   140,    89,    90,   138,     8,
-     135,    59,   162,   112,    50,    24,   125,   163,   125,   -28,
+       9,    89,    90,     2,   -30,    96,   149,    51,   -30,   -30,
-      90,   144,   -28,   -28,   -28,   -28,   -28,   -28,   -28,   -28,
+     -30,   -30,   -30,   -30,   -30,   -30,    97,    54,   -30,   -30,
-     -28,    91,    54,   -28,   -28,    92,   -28,    93,    94,    95,
+      98,   -30,    99,   100,   101,   102,   103,   104,    56,   105,
-      96,    97,    98,    52,    99,    55,    90,   161,    62,   100,
+     167,    91,    58,   166,   106,   168,    60,   -32,    96,    64,
-     -49,   -49,    63,   -49,   -49,   -49,   -49,    91,    64,   -49,
+      65,   -32,   -32,   -32,   -32,   -32,   -32,   -32,   -32,    97,
-     -49,    92,   107,   108,   109,   110,   154,    73,   141,   115,
+     159,   -32,   -32,    98,   -32,    99,   100,   101,   102,   103,
-      99,    75,   126,    76,   126,   111,   133,    56,    57,    83,
+     104,   121,   105,    62,   132,   174,   132,   106,   146,    70,
-      84,   169,   140,   151,   -30,    90,    77,   -30,   -30,   -30,
+      -5,    12,    89,    90,    13,    14,    15,    16,    17,    18,
-     -30,   -30,   -30,   -30,   -30,   -30,    91,    78,   -30,   -30,
+      19,    20,    63,   156,    21,    22,    23,    24,    25,    26,
-      92,   -30,    93,    94,    95,    96,    97,    98,   120,    99,
+      27,    28,    29,   122,   125,    30,   133,    -4,    12,    71,
-     128,    79,    -2,     4,   100,     5,     6,     7,     8,     9,
+      31,    13,    14,    15,    16,    17,    18,    19,    20,    72,
-      10,    11,    12,    13,    83,    84,    14,    15,    16,    17,
+      51,    21,    22,    23,    24,    25,    26,    27,    28,    29,
-      18,    19,    20,    21,    22,     7,     8,    23,    10,    11,
+     124,   129,    30,   137,   -84,    96,    81,    31,   -84,   -84,
-      12,    13,    24,    80,    14,    15,    88,   -81,    90,   179,
+     -84,   -84,   -84,   -84,   -84,   -84,    82,    83,   -84,   -84,
-     -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,   -81,    89,
+      98,   -84,   -84,   -84,   -84,   -84,   -84,    84,   184,   105,
-      24,   -81,   -81,    92,   -81,   -81,   -81,   -81,   -81,   -81,
+      85,    96,    86,    94,   130,   -51,   -51,    95,   -51,   -51,
-     116,   119,    99,   127,   122,    90,   130,   124,   -72,   -72,
+     -51,   -51,    97,   143,   -51,   -51,    98,   113,   114,   115,
-     -72,   -72,   -72,   -72,   -72,   -72,   132,   138,   -72,   -72,
+     116,     2,    89,    90,   144,   105,   145,   126,    96,   134,
-      92,   155,   158,   159,   160,   118,   123,   139,   131,    99,
+     117,   -75,   -75,   -75,   -75,   -75,   -75,   -75,   -75,   150,
-     165,   145,   167,   148,   124,    73,    83,    84,    83,    84,
+     153,   -75,   -75,    98,    13,    14,    15,    16,    17,    18,
-     173,   168,    83,    84,   149,   150,   153,   155,    84,   157,
+      19,    20,   105,   155,    21,    22,   154,   130,    14,    15,
-     164,   174,   166,   170,   171,   172,   176,   177,   178,    66,
+     158,    17,    18,    19,    20,    90,   160,    21,    22,   179,
-     114,   152,    85,     0,     0,     0,     0,     0,     0,    72
+      31,   163,   164,   165,   173,    89,    90,   162,   128,   170,
+     136,   172,    52,    31,   169,   171,   175,   176,   177,   178,
+     181,   182,   183,    50,   120,    74,    80,   157
 };
-static const yytype_int16 yycheck[] =
+static const yytype_uint8 yycheck[] =
 {
-       5,     6,     0,     8,    58,    59,    11,    86,    87,     4,
+       1,    66,    67,    10,    92,    93,     3,    25,    26,    14,
-       5,     6,     7,     8,     9,    10,    11,    30,    97,    14,
+       3,    29,    13,    27,    15,   103,    34,    18,    75,    33,
-      15,    27,    25,    26,    25,    26,    29,    33,    30,    83,
+       0,    78,    30,    80,    89,    90,    31,    32,    28,    25,
-      84,    34,    25,    67,    25,    30,    70,    30,    72,     0,
+      26,    31,    32,    30,     0,     1,   101,    30,     4,     5,
-       1,    95,     3,     4,     5,     6,     7,     8,     9,    10,
-      11,    12,    25,    14,    15,    16,    17,    18,    19,    20,
-      21,    22,    23,    30,    25,    25,     1,   146,    30,    30,
-       5,     6,     1,     8,     9,    10,    11,    12,     1,    14,
-      15,    16,    17,    18,    19,    20,   140,    30,    93,    67,
-      25,    30,    70,    30,    72,    30,    28,    25,    26,    31,
-      32,   155,    24,   108,     0,     1,    30,     3,     4,     5,
       6,     7,     8,     9,    10,    11,    12,    30,    14,    15,
-      16,    17,    18,    19,    20,    21,    22,    23,    69,    25,
+      16,    17,    18,    19,    20,    21,    22,    23,    30,    25,
-      71,    30,     0,     1,    30,     3,     4,     5,     6,     7,
+      25,    68,    25,   151,    30,    30,    30,     0,     1,    25,
-       8,     9,    10,    11,    31,    32,    14,    15,    16,    17,
+      26,     4,     5,     6,     7,     8,     9,    10,    11,    12,
-      18,    19,    20,    21,    22,     5,     6,    25,     8,     9,
+     145,    14,    15,    16,    17,    18,    19,    20,    21,    22,
-      10,    11,    30,    30,    14,    15,    30,     0,     1,   174,
+      23,    75,    25,    25,    78,   160,    80,    30,    99,    30,
-       3,     4,     5,     6,     7,     8,     9,    10,    11,    30,
+       0,     1,    31,    32,     4,     5,     6,     7,     8,     9,
+      10,    11,    25,   114,    14,    15,    16,    17,    18,    19,
+      20,    21,    22,    76,    77,    25,    79,     0,     1,     1,
+      30,     4,     5,     6,     7,     8,     9,    10,    11,     1,
      30,    14,    15,    16,    17,    18,    19,    20,    21,    22,
-      68,    69,    25,    71,    69,     1,    71,    30,     4,     5,
+      76,    77,    25,    79,     0,     1,    30,    30,     4,     5,
       6,     7,     8,     9,    10,    11,    30,    30,    14,    15,
-      16,    14,   143,   144,   145,    68,    69,    30,    71,    25,
+      16,    17,    18,    19,    20,    21,    22,    30,   179,    25,
-     151,    25,   153,     1,    30,    30,    31,    32,    31,    32,
+      30,     1,    30,    30,    30,     5,     6,    30,     8,     9,
-     161,    30,    31,    32,    13,    30,    25,    14,    32,    30,
+      10,    11,    12,    30,    14,    15,    16,    17,    18,    19,
-      30,    33,    30,    30,    30,    30,    30,    30,    30,    29,
+      20,    30,    31,    32,    30,    25,    24,    77,     1,    79,
-      67,   109,    60,    -1,    -1,    -1,    -1,    -1,    -1,    40
+      30,     4,     5,     6,     7,     8,     9,    10,    11,    25,
+       1,    14,    15,    16,     4,     5,     6,     7,     8,     9,
+      10,    11,    25,    30,    14,    15,    13,    30,     5,     6,
+      25,     8,     9,    10,    11,    32,    14,    14,    15,    33,
+      30,   148,   149,   150,    30,    31,    32,    30,    77,   156,
+      79,   158,     7,    30,    30,    30,    30,    30,    30,   166,
+      30,    30,    30,     6,    75,    36,    47,   115
 };
 /* YYSTOS[STATE-NUM] -- The (internal number of the) accessing
   symbol of state STATE-NUM.  */
 static const yytype_uint8 yystos[] =
 {
-       0,    36,    37,     0,     1,     3,     4,     5,     6,     7,
+       0,     3,    30,    36,    37,    38,    62,    78,    25,    26,
-       8,     9,    10,    11,    14,    15,    16,    17,    18,    19,
+      76,     0,     1,     4,     5,     6,     7,     8,     9,    10,
-      20,    21,    22,    25,    30,    38,    39,    41,    42,    43,
+      11,    14,    15,    16,    17,    18,    19,    20,    21,    22,
-      44,    50,    51,    53,    57,    59,    61,    62,    64,    66,
+      25,    30,    39,    40,    42,    43,    44,    45,    51,    52,
-      67,    68,    75,    30,    25,    26,    74,    74,    30,    74,
+      54,    58,    60,    63,    64,    66,    68,    69,    70,    77,
-      25,    80,    30,    74,    25,    25,    25,    26,    29,    34,
+      38,    30,    37,    78,    30,    76,    30,    76,    25,    82,
-      78,    79,    30,     1,     1,    45,    45,    54,    56,    60,
+      30,    76,    25,    25,    25,    26,    29,    34,    80,    81,
-      71,    65,    71,    30,    76,    30,    30,    30,    30,    30,
+      30,     1,     1,    46,    46,    55,    57,    61,    73,    67,
-      30,    78,    78,    31,    32,    76,    27,    33,    30,    30,
+      73,    30,    30,    30,    30,    30,    30,    80,    80,    31,
-       1,    12,    16,    18,    19,    20,    21,    22,    23,    25,
+      32,    78,    27,    33,    30,    30,     1,    12,    16,    18,
-      30,    40,    46,    47,    69,    70,    72,    17,    18,    19,
+      19,    20,    21,    22,    23,    25,    30,    41,    47,    48,
-      20,    30,    40,    55,    70,    72,    39,    52,    75,    39,
+      71,    72,    74,    17,    18,    19,    20,    30,    41,    56,
-      53,    58,    64,    75,    30,    40,    72,    39,    53,    63,
+      72,    74,    40,    53,    77,    40,    54,    59,    66,    77,
-      64,    75,    30,    28,    78,    78,    79,    79,    30,    30,
+      30,    41,    74,    40,    54,    65,    66,    77,    28,    80,
-      24,    74,    73,    74,    78,    25,    79,    48,     1,    13,
+      80,    81,    81,    30,    30,    24,    76,    75,    76,    80,
-      30,    74,    73,    25,    78,    14,    77,    30,    77,    77,
+      25,    81,    49,     1,    13,    30,    76,    75,    25,    80,
-      77,    79,    25,    30,    30,    77,    30,    77,    30,    78,
+      14,    79,    30,    79,    79,    79,    81,    25,    30,    30,
-      30,    30,    30,    77,    33,    49,    30,    30,    30,    74
+      79,    30,    79,    30,    80,    30,    30,    30,    79,    33,
+      50,    30,    30,    30,    76
 };
 #define yyerrok         (yyerrstatus = 0)
@@ -1284,7 +1292,7 @@ yydestruct (yymsg, yytype, yyvaluep)
  switch (yytype)
    {
-      case 51: /* "choice_entry" */
+      case 52: /* "choice_entry" */
        {
        fprintf(stderr, "%s:%d: missing end statement for this entry\n",
@@ -1294,7 +1302,7 @@ yydestruct (yymsg, yytype, yyvaluep)
 };
        break;
-      case 57: /* "if_entry" */
+      case 58: /* "if_entry" */
        {
        fprintf(stderr, "%s:%d: missing end statement for this entry\n",
@@ -1304,7 +1312,7 @@ yydestruct (yymsg, yytype, yyvaluep)
 };
        break;
-      case 62: /* "menu_entry" */
+      case 64: /* "menu_entry" */
        {
        fprintf(stderr, "%s:%d: missing end statement for this entry\n",
@@ -1614,39 +1622,39 @@ yyreduce:
  YY_REDUCE_PRINT (yyn);
  switch (yyn)
    {
-        case 8:
+        case 10:
    { zconf_error("unexpected end statement"); ;}
    break;
-  case 9:
+  case 11:
    { zconf_error("unknown statement \"%s\"", (yyvsp[(2) - (4)].string)); ;}
    break;
-  case 10:
+  case 12:
    {
        zconf_error("unexpected option \"%s\"", kconf_id_strings + (yyvsp[(2) - (4)].id)->name);
 ;}
    break;
-  case 11:
+  case 13:
    { zconf_error("invalid statement"); ;}
    break;
-  case 25:
+  case 27:
    { zconf_error("unknown option \"%s\"", (yyvsp[(1) - (3)].string)); ;}
    break;
-  case 26:
+  case 28:
    { zconf_error("invalid option"); ;}
    break;
-  case 27:
+  case 29:
    {
        struct symbol *sym = sym_lookup((yyvsp[(2) - (3)].string), 0);
@@ -1656,7 +1664,7 @@ yyreduce:
 ;}
    break;
-  case 28:
+  case 30:
    {
        menu_end_entry();
@@ -1664,7 +1672,7 @@ yyreduce:
 ;}
    break;
-  case 29:
+  case 31:
    {
        struct symbol *sym = sym_lookup((yyvsp[(2) - (3)].string), 0);
@@ -1674,7 +1682,7 @@ yyreduce:
 ;}
    break;
-  case 30:
+  case 32:
    {
        if (current_entry->prompt)
@@ -1686,7 +1694,7 @@ yyreduce:
 ;}
    break;
-  case 38:
+  case 40:
    {
        menu_set_type((yyvsp[(1) - (3)].id)->stype);
@@ -1696,7 +1704,7 @@ yyreduce:
 ;}
    break;
-  case 39:
+  case 41:
    {
        menu_add_prompt(P_PROMPT, (yyvsp[(2) - (4)].string), (yyvsp[(3) - (4)].expr));
@@ -1704,7 +1712,7 @@ yyreduce:
 ;}
    break;
-  case 40:
+  case 42:
    {
        menu_add_expr(P_DEFAULT, (yyvsp[(2) - (4)].expr), (yyvsp[(3) - (4)].expr));
@@ -1716,7 +1724,7 @@ yyreduce:
 ;}
    break;
-  case 41:
+  case 43:
    {
        menu_add_symbol(P_SELECT, sym_lookup((yyvsp[(2) - (4)].string), 0), (yyvsp[(3) - (4)].expr));
@@ -1724,7 +1732,7 @@ yyreduce:
 ;}
    break;
-  case 42:
+  case 44:
    {
        menu_add_expr(P_RANGE, expr_alloc_comp(E_RANGE,(yyvsp[(2) - (5)].symbol), (yyvsp[(3) - (5)].symbol)), (yyvsp[(4) - (5)].expr));
@@ -1732,7 +1740,7 @@ yyreduce:
 ;}
    break;
-  case 45:
+  case 47:
    {
        struct kconf_id *id = kconf_id_lookup((yyvsp[(2) - (3)].string), strlen((yyvsp[(2) - (3)].string)));
@@ -1744,17 +1752,17 @@ yyreduce:
 ;}
    break;
-  case 46:
+  case 48:
    { (yyval.string) = NULL; ;}
    break;
-  case 47:
+  case 49:
    { (yyval.string) = (yyvsp[(2) - (2)].string); ;}
    break;
-  case 48:
+  case 50:
    {
        struct symbol *sym = sym_lookup((yyvsp[(2) - (3)].string), SYMBOL_CHOICE);
@@ -1765,14 +1773,14 @@ yyreduce:
 ;}
    break;
-  case 49:
+  case 51:
    {
        (yyval.menu) = menu_add_menu();
 ;}
    break;
-  case 50:
+  case 52:
    {
        if (zconf_endtoken((yyvsp[(1) - (1)].id), T_CHOICE, T_ENDCHOICE)) {
@@ -1782,7 +1790,7 @@ yyreduce:
 ;}
    break;
-  case 58:
+  case 60:
    {
        menu_add_prompt(P_PROMPT, (yyvsp[(2) - (4)].string), (yyvsp[(3) - (4)].expr));
@@ -1790,7 +1798,7 @@ yyreduce:
 ;}
    break;
-  case 59:
+  case 61:
    {
        if ((yyvsp[(1) - (3)].id)->stype == S_BOOLEAN || (yyvsp[(1) - (3)].id)->stype == S_TRISTATE) {
@@ -1803,7 +1811,7 @@ yyreduce:
 ;}
    break;
-  case 60:
+  case 62:
    {
        current_entry->sym->flags |= SYMBOL_OPTIONAL;
@@ -1811,7 +1819,7 @@ yyreduce:
 ;}
    break;
-  case 61:
+  case 63:
    {
        if ((yyvsp[(1) - (4)].id)->stype == S_UNKNOWN) {
@@ -1823,7 +1831,7 @@ yyreduce:
 ;}
    break;
-  case 64:
+  case 66:
    {
        printd(DEBUG_PARSE, "%s:%d:if\n", zconf_curname(), zconf_lineno());
@@ -1833,7 +1841,7 @@ yyreduce:
 ;}
    break;
-  case 65:
+  case 67:
    {
        if (zconf_endtoken((yyvsp[(1) - (1)].id), T_IF, T_ENDIF)) {
@@ -1843,7 +1851,14 @@ yyreduce:
 ;}
    break;
-  case 71:
+  case 73:
+    {
+        menu_add_prompt(P_MENU, (yyvsp[(2) - (3)].string), NULL);
+;}
+    break;
+  case 74:
    {
        menu_add_entry(NULL);
@@ -1852,14 +1867,14 @@ yyreduce:
 ;}
    break;
-  case 72:
+  case 75:
    {
        (yyval.menu) = menu_add_menu();
 ;}
    break;
-  case 73:
+  case 76:
    {
        if (zconf_endtoken((yyvsp[(1) - (1)].id), T_MENU, T_ENDMENU)) {
@@ -1869,7 +1884,7 @@ yyreduce:
 ;}
    break;
-  case 79:
+  case 82:
    {
        printd(DEBUG_PARSE, "%s:%d:source %s\n", zconf_curname(), zconf_lineno(), (yyvsp[(2) - (3)].string));
@@ -1877,7 +1892,7 @@ yyreduce:
 ;}
    break;
-  case 80:
+  case 83:
    {
        menu_add_entry(NULL);
@@ -1886,14 +1901,14 @@ yyreduce:
 ;}
    break;
-  case 81:
+  case 84:
    {
        menu_end_entry();
 ;}
    break;
-  case 82:
+  case 85:
    {
        printd(DEBUG_PARSE, "%s:%d:help\n", zconf_curname(), zconf_lineno());
@@ -1901,14 +1916,14 @@ yyreduce:
 ;}
    break;
-  case 83:
+  case 86:
    {
        current_entry->help = (yyvsp[(2) - (2)].string);
 ;}
    break;
-  case 88:
+  case 91:
    {
        menu_add_dep((yyvsp[(3) - (4)].expr));
@@ -1916,84 +1931,84 @@ yyreduce:
 ;}
    break;
-  case 90:
+  case 93:
    {
        menu_add_prompt(P_PROMPT, (yyvsp[(1) - (2)].string), (yyvsp[(2) - (2)].expr));
 ;}
    break;
-  case 93:
+  case 96:
    { (yyval.id) = (yyvsp[(1) - (2)].id); ;}
    break;
-  case 94:
+  case 97:
    { (yyval.id) = (yyvsp[(1) - (2)].id); ;}
    break;
-  case 95:
+  case 98:
    { (yyval.id) = (yyvsp[(1) - (2)].id); ;}
    break;
-  case 98:
+  case 101:
    { (yyval.expr) = NULL; ;}
    break;
-  case 99:
+  case 102:
    { (yyval.expr) = (yyvsp[(2) - (2)].expr); ;}
    break;
-  case 100:
+  case 103:
    { (yyval.expr) = expr_alloc_symbol((yyvsp[(1) - (1)].symbol)); ;}
    break;
-  case 101:
+  case 104:
    { (yyval.expr) = expr_alloc_comp(E_EQUAL, (yyvsp[(1) - (3)].symbol), (yyvsp[(3) - (3)].symbol)); ;}
    break;
-  case 102:
+  case 105:
    { (yyval.expr) = expr_alloc_comp(E_UNEQUAL, (yyvsp[(1) - (3)].symbol), (yyvsp[(3) - (3)].symbol)); ;}
    break;
-  case 103:
+  case 106:
    { (yyval.expr) = (yyvsp[(2) - (3)].expr); ;}
    break;
-  case 104:
+  case 107:
    { (yyval.expr) = expr_alloc_one(E_NOT, (yyvsp[(2) - (2)].expr)); ;}
    break;
-  case 105:
+  case 108:
    { (yyval.expr) = expr_alloc_two(E_OR, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); ;}
    break;
-  case 106:
+  case 109:
    { (yyval.expr) = expr_alloc_two(E_AND, (yyvsp[(1) - (3)].expr), (yyvsp[(3) - (3)].expr)); ;}
    break;
-  case 107:
+  case 110:
    { (yyval.symbol) = sym_lookup((yyvsp[(1) - (1)].string), 0); free((yyvsp[(1) - (1)].string)); ;}
    break;
-  case 108:
+  case 111:
    { (yyval.symbol) = sym_lookup((yyvsp[(1) - (1)].string), SYMBOL_CONST); free((yyvsp[(1) - (1)].string)); ;}
    break;
-  case 109:
+  case 112:
    { (yyval.string) = NULL; ;}
    break;
@@ -2239,6 +2254,10 @@ void conf_parse(const char *name)
                prop = prop_alloc(P_DEFAULT, modules_sym);
                prop->expr = expr_alloc_symbol(sym_lookup("MODULES", 0));
        }
+        rootmenu.prompt->text = _(rootmenu.prompt->text);
+        rootmenu.prompt->text = sym_expand_string_value(rootmenu.prompt->text);
        menu_finalize(&rootmenu);
        for_all_symbols(i, sym) {
                if (sym_check_deps(sym))
diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y
index 23dfd3baa7a1..2abd3c7ff15d 100644
--- a/scripts/kconfig/zconf.y
+++ b/scripts/kconfig/zconf.y
@@ -36,7 +36,7 @@ static struct menu *current_menu, *current_entry;
 #define YYERROR_VERBOSE
 #endif
 %}
-%expect 26
+%expect 28
 %union
 {
@@ -104,14 +104,15 @@ static struct menu *current_menu, *current_entry;
 %}
 %%
-input: stmt_list;
+input: nl start | start;
+start: mainmenu_stmt stmt_list | stmt_list;
 stmt_list:
          /* empty */
        | stmt_list common_stmt
        | stmt_list choice_stmt
        | stmt_list menu_stmt
-        | stmt_list T_MAINMENU prompt nl
        | stmt_list end                 { zconf_error("unexpected end statement"); }
        | stmt_list T_WORD error T_EOL  { zconf_error("unknown statement \"%s\"", $2); }
        | stmt_list option_name error T_EOL
@@ -342,6 +343,13 @@ if_block:
        | if_block choice_stmt
 ;
+/* mainmenu entry */
+mainmenu_stmt: T_MAINMENU prompt nl
+{
+        menu_add_prompt(P_MENU, $2, NULL);
+};
 /* menu entry */
 menu: T_MENU prompt T_EOL
@@ -494,6 +502,10 @@ void conf_parse(const char *name)
                prop = prop_alloc(P_DEFAULT, modules_sym);
                prop->expr = expr_alloc_symbol(sym_lookup("MODULES", 0));
        }
+        rootmenu.prompt->text = _(rootmenu.prompt->text);
+        rootmenu.prompt->text = sym_expand_string_value(rootmenu.prompt->text);
        menu_finalize(&rootmenu);
        for_all_symbols(i, sym) {
                if (sym_check_deps(sym))
diff --git a/scripts/kernel-doc b/scripts/kernel-doc
index fcdfb245a575..102e1235fd5c 100755
--- a/scripts/kernel-doc
+++ b/scripts/kernel-doc
@@ -1454,6 +1454,8 @@ sub dump_enum($$) {
    my $file = shift;
    $x =~ s@/\*.*?\*/@@gos;     # strip comments.
+    $x =~ s/^#\s*define\s+.*$//; # strip #define macros inside enums
    if ($x =~ /enum\s+(\w+)\s*{(.*)}/) {
        $declaration_name = $1;
        my $members = $2;
diff --git a/scripts/mkmakefile b/scripts/mkmakefile
index 67d59c7a18dc..5325423ceab4 100644
--- a/scripts/mkmakefile
+++ b/scripts/mkmakefile
@@ -44,7 +44,9 @@ all:
 Makefile:;
-\$(all) %/: all
+\$(all): all
        @:
+%/: all
+        @:
 EOF
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 5758aab0d8bb..88f3f07205f8 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -884,16 +884,16 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
        char *zeros = NULL;
        /* We're looking for a section relative symbol */
-        if (!sym->st_shndx || sym->st_shndx >= info->hdr->e_shnum)
+        if (!sym->st_shndx || get_secindex(info, sym) >= info->num_sections)
                return;
        /* Handle all-NULL symbols allocated into .bss */
-        if (info->sechdrs[sym->st_shndx].sh_type & SHT_NOBITS) {
+        if (info->sechdrs[get_secindex(info, sym)].sh_type & SHT_NOBITS) {
                zeros = calloc(1, sym->st_size);
                symval = zeros;
        } else {
                symval = (void *)info->hdr
-                        + info->sechdrs[sym->st_shndx].sh_offset
+                        + info->sechdrs[get_secindex(info, sym)].sh_offset
                        + sym->st_value;
        }
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index f6127b9f5aca..1ec7158b6c1f 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -14,6 +14,7 @@
 #define _GNU_SOURCE
 #include <stdio.h>
 #include <ctype.h>
+#include <string.h>
 #include "modpost.h"
 #include "../../include/generated/autoconf.h"
 #include "../../include/linux/license.h"
@@ -253,7 +254,7 @@ static enum export export_no(const char *s)
        return export_unknown;
 }
-static enum export export_from_sec(struct elf_info *elf, Elf_Section sec)
+static enum export export_from_sec(struct elf_info *elf, unsigned int sec)
 {
        if (sec == elf->export_sec)
                return export_plain;
@@ -373,6 +374,8 @@ static int parse_elf(struct elf_info *info, const char *filename)
        Elf_Ehdr *hdr;
        Elf_Shdr *sechdrs;
        Elf_Sym  *sym;
+        const char *secstrings;
+        unsigned int symtab_idx = ~0U, symtab_shndx_idx = ~0U;
        hdr = grab_file(filename, &info->size);
        if (!hdr) {
@@ -417,8 +420,27 @@ static int parse_elf(struct elf_info *info, const char *filename)
                return 0;
        }
+        if (hdr->e_shnum == 0) {
+                /*
+                 * There are more than 64k sections,
+                 * read count from .sh_size.
+                 * note: it doesn't need shndx2secindex()
+                 */
+                info->num_sections = TO_NATIVE(sechdrs[0].sh_size);
+        }
+        else {
+                info->num_sections = hdr->e_shnum;
+        }
+        if (hdr->e_shstrndx == SHN_XINDEX) {
+                info->secindex_strings =
+                    shndx2secindex(TO_NATIVE(sechdrs[0].sh_link));
+        }
+        else {
+                info->secindex_strings = hdr->e_shstrndx;
+        }
        /* Fix endianness in section headers */
-        for (i = 0; i < hdr->e_shnum; i++) {
+        for (i = 0; i < info->num_sections; i++) {
                sechdrs[i].sh_name      = TO_NATIVE(sechdrs[i].sh_name);
                sechdrs[i].sh_type      = TO_NATIVE(sechdrs[i].sh_type);
                sechdrs[i].sh_flags     = TO_NATIVE(sechdrs[i].sh_flags);
@@ -431,9 +453,8 @@ static int parse_elf(struct elf_info *info, const char *filename)
                sechdrs[i].sh_entsize   = TO_NATIVE(sechdrs[i].sh_entsize);
        }
        /* Find symbol table. */
-        for (i = 1; i < hdr->e_shnum; i++) {
+        secstrings = (void *)hdr + sechdrs[info->secindex_strings].sh_offset;
-                const char *secstrings
+        for (i = 1; i < info->num_sections; i++) {
-                        = (void *)hdr + sechdrs[hdr->e_shstrndx].sh_offset;
                const char *secname;
                int nobits = sechdrs[i].sh_type == SHT_NOBITS;
@@ -461,14 +482,26 @@ static int parse_elf(struct elf_info *info, const char *filename)
                else if (strcmp(secname, "__ksymtab_gpl_future") == 0)
                        info->export_gpl_future_sec = i;
-                if (sechdrs[i].sh_type != SHT_SYMTAB)
+                if (sechdrs[i].sh_type == SHT_SYMTAB) {
-                        continue;
+                        unsigned int sh_link_idx;
+                        symtab_idx = i;
+                        info->symtab_start = (void *)hdr +
+                            sechdrs[i].sh_offset;
+                        info->symtab_stop  = (void *)hdr +
+                            sechdrs[i].sh_offset + sechdrs[i].sh_size;
+                        sh_link_idx = shndx2secindex(sechdrs[i].sh_link);
+                        info->strtab       = (void *)hdr +
+                            sechdrs[sh_link_idx].sh_offset;
+                }
-                info->symtab_start = (void *)hdr + sechdrs[i].sh_offset;
+                /* 32bit section no. table? ("more than 64k sections") */
-                info->symtab_stop  = (void *)hdr + sechdrs[i].sh_offset
+                if (sechdrs[i].sh_type == SHT_SYMTAB_SHNDX) {
-                                                 + sechdrs[i].sh_size;
+                        symtab_shndx_idx = i;
-                info->strtab       = (void *)hdr +
+                        info->symtab_shndx_start = (void *)hdr +
-                                     sechdrs[sechdrs[i].sh_link].sh_offset;
+                            sechdrs[i].sh_offset;
+                        info->symtab_shndx_stop  = (void *)hdr +
+                            sechdrs[i].sh_offset + sechdrs[i].sh_size;
+                }
        }
        if (!info->symtab_start)
                fatal("%s has no symtab?\n", filename);
@@ -480,6 +513,21 @@ static int parse_elf(struct elf_info *info, const char *filename)
                sym->st_value = TO_NATIVE(sym->st_value);
                sym->st_size  = TO_NATIVE(sym->st_size);
        }
+        if (symtab_shndx_idx != ~0U) {
+                Elf32_Word *p;
+                if (symtab_idx !=
+                    shndx2secindex(sechdrs[symtab_shndx_idx].sh_link))
+                        fatal("%s: SYMTAB_SHNDX has bad sh_link: %u!=%u\n",
+                              filename,
+                              shndx2secindex(sechdrs[symtab_shndx_idx].sh_link),
+                              symtab_idx);
+                /* Fix endianness */
+                for (p = info->symtab_shndx_start; p < info->symtab_shndx_stop;
+                     p++)
+                        *p = TO_NATIVE(*p);
+        }
        return 1;
 }
@@ -519,7 +567,7 @@ static void handle_modversions(struct module *mod, struct elf_info *info,
                               Elf_Sym *sym, const char *symname)
 {
        unsigned int crc;
-        enum export export = export_from_sec(info, sym->st_shndx);
+        enum export export = export_from_sec(info, get_secindex(info, sym));
        switch (sym->st_shndx) {
        case SHN_COMMON:
@@ -661,19 +709,19 @@ static const char *sym_name(struct elf_info *elf, Elf_Sym *sym)
                return "(unknown)";
 }
-static const char *sec_name(struct elf_info *elf, int shndx)
+static const char *sec_name(struct elf_info *elf, int secindex)
 {
        Elf_Shdr *sechdrs = elf->sechdrs;
        return (void *)elf->hdr +
-                elf->sechdrs[elf->hdr->e_shstrndx].sh_offset +
+                elf->sechdrs[elf->secindex_strings].sh_offset +
-                sechdrs[shndx].sh_name;
+                sechdrs[secindex].sh_name;
 }
 static const char *sech_name(struct elf_info *elf, Elf_Shdr *sechdr)
 {
        return (void *)elf->hdr +
-                elf->sechdrs[elf->hdr->e_shstrndx].sh_offset +
+                elf->sechdrs[elf->secindex_strings].sh_offset +
-                sechdr->sh_name;
+                sechdr->sh_name;
 }
 /* if sym is empty or point to a string
@@ -742,6 +790,7 @@ static const char *section_white_list[] =
 {
        ".comment*",
        ".debug*",
+        ".GCC-command-line",    /* mn10300 */
        ".mdebug*",        /* alpha, score, mips etc. */
        ".pdr",            /* alpha, score, mips etc. */
        ".stab*",
@@ -986,6 +1035,13 @@ static const struct sectioncheck *section_mismatch(
 *   fromsec = .data*
 *   atsym   =__param*
 *
+ * Pattern 1a:
+ *   module_param_call() ops can refer to __init set function if permissions=0
+ *   The pattern is identified by:
+ *   tosec   = .init.text
+ *   fromsec = .data*
+ *   atsym   = __param_ops_*
+ *
 * Pattern 2:
 *   Many drivers utilise a *driver container with references to
 *   add, remove, probe functions etc.
@@ -1020,6 +1076,12 @@ static int secref_whitelist(const struct sectioncheck *mismatch,
            (strncmp(fromsym, "__param", strlen("__param")) == 0))
                return 0;
+        /* Check for pattern 1a */
+        if (strcmp(tosec, ".init.text") == 0 &&
+            match(fromsec, data_sections) &&
+            (strncmp(fromsym, "__param_ops_", strlen("__param_ops_")) == 0))
+                return 0;
        /* Check for pattern 2 */
        if (match(tosec, init_exit_sections) &&
            match(fromsec, data_sections) &&
@@ -1052,11 +1114,14 @@ static Elf_Sym *find_elf_symbol(struct elf_info *elf, Elf64_Sword addr,
        Elf_Sym *near = NULL;
        Elf64_Sword distance = 20;
        Elf64_Sword d;
+        unsigned int relsym_secindex;
        if (relsym->st_name != 0)
                return relsym;
+        relsym_secindex = get_secindex(elf, relsym);
        for (sym = elf->symtab_start; sym < elf->symtab_stop; sym++) {
-                if (sym->st_shndx != relsym->st_shndx)
+                if (get_secindex(elf, sym) != relsym_secindex)
                        continue;
                if (ELF_ST_TYPE(sym->st_info) == STT_SECTION)
                        continue;
@@ -1118,9 +1183,9 @@ static Elf_Sym *find_elf_symbol2(struct elf_info *elf, Elf_Addr addr,
        for (sym = elf->symtab_start; sym < elf->symtab_stop; sym++) {
                const char *symsec;
-                if (sym->st_shndx >= SHN_LORESERVE)
+                if (is_shndx_special(sym->st_shndx))
                        continue;
-                symsec = sec_name(elf, sym->st_shndx);
+                symsec = sec_name(elf, get_secindex(elf, sym));
                if (strcmp(symsec, sec) != 0)
                        continue;
                if (!is_valid_name(elf, sym))
@@ -1167,7 +1232,7 @@ static char *sec2annotation(const char *s)
                        strcat(p, " ");
                return r; /* we leak her but we do not care */
        } else {
-                return "";
+                return strdup("");
        }
 }
@@ -1195,6 +1260,8 @@ static void report_sec_mismatch(const char *modname,
 {
        const char *from, *from_p;
        const char *to, *to_p;
+        char *prl_from;
+        char *prl_to;
        switch (from_is_func) {
        case 0: from = "variable"; from_p = "";   break;
@@ -1218,16 +1285,21 @@ static void report_sec_mismatch(const char *modname,
        switch (mismatch->mismatch) {
        case TEXT_TO_ANY_INIT:
+                prl_from = sec2annotation(fromsec);
+                prl_to = sec2annotation(tosec);
                fprintf(stderr,
                "The function %s%s() references\n"
                "the %s %s%s%s.\n"
                "This is often because %s lacks a %s\n"
                "annotation or the annotation of %s is wrong.\n",
-                sec2annotation(fromsec), fromsym,
+                prl_from, fromsym,
-                to, sec2annotation(tosec), tosym, to_p,
+                to, prl_to, tosym, to_p,
-                fromsym, sec2annotation(tosec), tosym);
+                fromsym, prl_to, tosym);
+                free(prl_from);
+                free(prl_to);
                break;
        case DATA_TO_ANY_INIT: {
+                prl_to = sec2annotation(tosec);
                const char *const *s = mismatch->symbol_white_list;
                fprintf(stderr,
                "The variable %s references\n"
@@ -1235,20 +1307,24 @@ static void report_sec_mismatch(const char *modname,
                "If the reference is valid then annotate the\n"
                "variable with __init* or __refdata (see linux/init.h) "
                "or name the variable:\n",
-                fromsym, to, sec2annotation(tosec), tosym, to_p);
+                fromsym, to, prl_to, tosym, to_p);
                while (*s)
                        fprintf(stderr, "%s, ", *s++);
                fprintf(stderr, "\n");
+                free(prl_to);
                break;
        }
        case TEXT_TO_ANY_EXIT:
+                prl_to = sec2annotation(tosec);
                fprintf(stderr,
                "The function %s() references a %s in an exit section.\n"
                "Often the %s %s%s has valid usage outside the exit section\n"
                "and the fix is to remove the %sannotation of %s.\n",
-                fromsym, to, to, tosym, to_p, sec2annotation(tosec), tosym);
+                fromsym, to, to, tosym, to_p, prl_to, tosym);
+                free(prl_to);
                break;
        case DATA_TO_ANY_EXIT: {
+                prl_to = sec2annotation(tosec);
                const char *const *s = mismatch->symbol_white_list;
                fprintf(stderr,
                "The variable %s references\n"
@@ -1256,24 +1332,31 @@ static void report_sec_mismatch(const char *modname,
                "If the reference is valid then annotate the\n"
                "variable with __exit* (see linux/init.h) or "
                "name the variable:\n",
-                fromsym, to, sec2annotation(tosec), tosym, to_p);
+                fromsym, to, prl_to, tosym, to_p);
                while (*s)
                        fprintf(stderr, "%s, ", *s++);
                fprintf(stderr, "\n");
+                free(prl_to);
                break;
        }
        case XXXINIT_TO_SOME_INIT:
        case XXXEXIT_TO_SOME_EXIT:
+                prl_from = sec2annotation(fromsec);
+                prl_to = sec2annotation(tosec);
                fprintf(stderr,
                "The %s %s%s%s references\n"
                "a %s %s%s%s.\n"
                "If %s is only used by %s then\n"
                "annotate %s with a matching annotation.\n",
-                from, sec2annotation(fromsec), fromsym, from_p,
+                from, prl_from, fromsym, from_p,
-                to, sec2annotation(tosec), tosym, to_p,
+                to, prl_to, tosym, to_p,
                tosym, fromsym, tosym);
+                free(prl_from);
+                free(prl_to);
                break;
        case ANY_INIT_TO_ANY_EXIT:
+                prl_from = sec2annotation(fromsec);
+                prl_to = sec2annotation(tosec);
                fprintf(stderr,
                "The %s %s%s%s references\n"
                "a %s %s%s%s.\n"
@@ -1282,11 +1365,15 @@ static void report_sec_mismatch(const char *modname,
                "uses functionality in the exit path.\n"
                "The fix is often to remove the %sannotation of\n"
                "%s%s so it may be used outside an exit section.\n",
-                from, sec2annotation(fromsec), fromsym, from_p,
+                from, prl_from, fromsym, from_p,
-                to, sec2annotation(tosec), tosym, to_p,
+                to, prl_to, tosym, to_p,
-                sec2annotation(tosec), tosym, to_p);
+                prl_to, tosym, to_p);
+                free(prl_from);
+                free(prl_to);
                break;
        case ANY_EXIT_TO_ANY_INIT:
+                prl_from = sec2annotation(fromsec);
+                prl_to = sec2annotation(tosec);
                fprintf(stderr,
                "The %s %s%s%s references\n"
                "a %s %s%s%s.\n"
@@ -1295,16 +1382,20 @@ static void report_sec_mismatch(const char *modname,
                "uses functionality in the init path.\n"
                "The fix is often to remove the %sannotation of\n"
                "%s%s so it may be used outside an init section.\n",
-                from, sec2annotation(fromsec), fromsym, from_p,
+                from, prl_from, fromsym, from_p,
-                to, sec2annotation(tosec), tosym, to_p,
+                to, prl_to, tosym, to_p,
-                sec2annotation(tosec), tosym, to_p);
+                prl_to, tosym, to_p);
+                free(prl_from);
+                free(prl_to);
                break;
        case EXPORT_TO_INIT_EXIT:
+                prl_to = sec2annotation(tosec);
                fprintf(stderr,
                "The symbol %s is exported and annotated %s\n"
                "Fix this by removing the %sannotation of %s "
                "or drop the export.\n",
-                tosym, sec2annotation(tosec), sec2annotation(tosec), tosym);
+                tosym, prl_to, prl_to, tosym);
+                free(prl_to);
                break;
        }
        fprintf(stderr, "\n");
@@ -1316,7 +1407,7 @@ static void check_section_mismatch(const char *modname, struct elf_info *elf,
        const char *tosec;
        const struct sectioncheck *mismatch;
-        tosec = sec_name(elf, sym->st_shndx);
+        tosec = sec_name(elf, get_secindex(elf, sym));
        mismatch = section_mismatch(fromsec, tosec);
        if (mismatch) {
                Elf_Sym *to;
@@ -1344,7 +1435,7 @@ static unsigned int *reloc_location(struct elf_info *elf,
                                    Elf_Shdr *sechdr, Elf_Rela *r)
 {
        Elf_Shdr *sechdrs = elf->sechdrs;
-        int section = sechdr->sh_info;
+        int section = shndx2secindex(sechdr->sh_info);
        return (void *)elf->hdr + sechdrs[section].sh_offset +
                r->r_offset - sechdrs[section].sh_addr;
@@ -1452,7 +1543,7 @@ static void section_rela(const char *modname, struct elf_info *elf,
                r.r_addend = TO_NATIVE(rela->r_addend);
                sym = elf->symtab_start + r_sym;
                /* Skip special sections */
-                if (sym->st_shndx >= SHN_LORESERVE)
+                if (is_shndx_special(sym->st_shndx))
                        continue;
                check_section_mismatch(modname, elf, &r, sym, fromsec);
        }
@@ -1510,7 +1601,7 @@ static void section_rel(const char *modname, struct elf_info *elf,
                }
                sym = elf->symtab_start + r_sym;
                /* Skip special sections */
-                if (sym->st_shndx >= SHN_LORESERVE)
+                if (is_shndx_special(sym->st_shndx))
                        continue;
                check_section_mismatch(modname, elf, &r, sym, fromsec);
        }
@@ -1535,7 +1626,7 @@ static void check_sec_ref(struct module *mod, const char *modname,
        Elf_Shdr *sechdrs = elf->sechdrs;
        /* Walk through all sections */
-        for (i = 0; i < elf->hdr->e_shnum; i++) {
+        for (i = 0; i < elf->num_sections; i++) {
                check_section(modname, elf, &elf->sechdrs[i]);
                /* We want to process only relocation sections and not .init */
                if (sechdrs[i].sh_type == SHT_RELA)
diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h
index be987a44f250..0388cfccac8d 100644
--- a/scripts/mod/modpost.h
+++ b/scripts/mod/modpost.h
@@ -129,8 +129,51 @@ struct elf_info {
        const char   *strtab;
        char         *modinfo;
        unsigned int modinfo_len;
+        /* support for 32bit section numbers */
+        unsigned int num_sections; /* max_secindex + 1 */
+        unsigned int secindex_strings;
+        /* if Nth symbol table entry has .st_shndx = SHN_XINDEX,
+         * take shndx from symtab_shndx_start[N] instead */
+        Elf32_Word   *symtab_shndx_start;
+        Elf32_Word   *symtab_shndx_stop;
 };
+static inline int is_shndx_special(unsigned int i)
+{
+        return i != SHN_XINDEX && i >= SHN_LORESERVE && i <= SHN_HIRESERVE;
+}
+/* shndx is in [0..SHN_LORESERVE) U (SHN_HIRESERVE, 0xfffffff], thus:
+ * shndx == 0               <=> sechdrs[0]
+ * ......
+ * shndx == SHN_LORESERVE-1 <=> sechdrs[SHN_LORESERVE-1]
+ * shndx == SHN_HIRESERVE+1 <=> sechdrs[SHN_LORESERVE]
+ * shndx == SHN_HIRESERVE+2 <=> sechdrs[SHN_LORESERVE+1]
+ * ......
+ * fyi: sym->st_shndx is uint16, SHN_LORESERVE = ff00, SHN_HIRESERVE = ffff,
+ * so basically we map  0000..feff -> 0000..feff
+ *                      ff00..ffff -> (you are a bad boy, dont do it)
+ *                     10000..xxxx -> ff00..(xxxx-0x100)
+ */
+static inline unsigned int shndx2secindex(unsigned int i)
+{
+        if (i <= SHN_HIRESERVE)
+                return i;
+        return i - (SHN_HIRESERVE + 1 - SHN_LORESERVE);
+}
+/* Accessor for sym->st_shndx, hides ugliness of "64k sections" */
+static inline unsigned int get_secindex(const struct elf_info *info,
+                                        const Elf_Sym *sym)
+{
+        if (sym->st_shndx != SHN_XINDEX)
+                return sym->st_shndx;
+        return shndx2secindex(info->symtab_shndx_start[sym -
+                                                       info->symtab_start]);
+}
 /* file2alias.c */
 extern unsigned int cross_build;
 void handle_moddevtable(struct module *mod, struct elf_info *info,
diff --git a/scripts/package/Makefile b/scripts/package/Makefile
index d2c29b63adda..d0b931b994fc 100644
--- a/scripts/package/Makefile
+++ b/scripts/package/Makefile
@@ -111,13 +111,38 @@ tar%pkg: FORCE
 clean-dirs += $(objtree)/tar-install/
+# perf-pkg - generate a source tarball with perf source
+# ---------------------------------------------------------------------------
+perf-tar=perf-$(KERNELVERSION)
+quiet_cmd_perf_tar = TAR
+      cmd_perf_tar = \
+git archive --prefix=$(perf-tar)/ HEAD^{tree}                       \
+        $$(cat $(srctree)/tools/perf/MANIFEST) -o $(perf-tar).tar;  \
+mkdir -p $(perf-tar);                                               \
+git rev-parse HEAD > $(perf-tar)/HEAD;                              \
+tar rf $(perf-tar).tar $(perf-tar)/HEAD;                            \
+rm -r $(perf-tar);                                                  \
+$(if $(findstring tar-src,$@),,                                     \
+$(if $(findstring bz2,$@),bzip2,                                    \
+$(if $(findstring gz,$@),gzip,                                      \
+$(error unknown target $@)))                                       \
+        -f -9 $(perf-tar).tar)
+perf-%pkg: FORCE
+        $(call cmd,perf_tar)
 # Help text displayed when executing 'make help'
 # ---------------------------------------------------------------------------
 help: FORCE
-        @echo '  rpm-pkg         - Build both source and binary RPM kernel packages'
+        @echo '  rpm-pkg             - Build both source and binary RPM kernel packages'
-        @echo '  binrpm-pkg      - Build only the binary kernel package'
+        @echo '  binrpm-pkg          - Build only the binary kernel package'
-        @echo '  deb-pkg         - Build the kernel as an deb package'
+        @echo '  deb-pkg             - Build the kernel as an deb package'
-        @echo '  tar-pkg         - Build the kernel as an uncompressed tarball'
+        @echo '  tar-pkg             - Build the kernel as an uncompressed tarball'
-        @echo '  targz-pkg       - Build the kernel as a gzip compressed tarball'
+        @echo '  targz-pkg           - Build the kernel as a gzip compressed tarball'
-        @echo '  tarbz2-pkg      - Build the kernel as a bzip2 compressed tarball'
+        @echo '  tarbz2-pkg          - Build the kernel as a bzip2 compressed tarball'
+        @echo '  perf-tar-src-pkg    - Build $(perf-tar).tar source tarball'
+        @echo '  perf-targz-src-pkg  - Build $(perf-tar).tar.gz source tarball'
+        @echo '  perf-tarbz2-src-pkg - Build $(perf-tar).tar.bz2 source tarball'
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 07f2fbde2abf..5f1e2fc7f171 100644
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -148,10 +148,11 @@ EOF
 # Generate a control file
 cat <<EOF > debian/control
 Source: linux-upstream
-Section: admin
+Section: kernel
 Priority: optional
 Maintainer: $maintainer
-Standards-Version: 3.8.1
+Standards-Version: 3.8.4
+Homepage: http://www.kernel.org/
 EOF
 if [ "$ARCH" = "um" ]; then
diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl
index f3c9c0a90b98..0171060b5fd6 100755
--- a/scripts/recordmcount.pl
+++ b/scripts/recordmcount.pl
@@ -326,7 +326,7 @@ if ($arch eq "x86_64") {
    #                    14: R_MIPS_NONE *ABS*
    #    18:   00020021        nop
    if ($is_module eq "0") {
-            $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s_mcount\$";
+            $mcount_regex = "^\\s*([0-9a-fA-F]+): R_MIPS_26\\s+_mcount\$";
    } else {
            $mcount_regex = "^\\s*([0-9a-fA-F]+): R_MIPS_HI16\\s+_mcount\$";
    }
diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index 64a9cb5556cd..057b6b3c5dfb 100755
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -43,7 +43,7 @@ scm_version()
        fi
        # Check for git and a git repo.
-        if head=`git rev-parse --verify --short HEAD 2>/dev/null`; then
+        if test -d .git && head=`git rev-parse --verify --short HEAD 2>/dev/null`; then
                # If we are at a tagged commit (like "v2.6.30-rc6"), we ignore
                # it, because this version is defined in the top level Makefile.
@@ -85,8 +85,8 @@ scm_version()
        fi
        # Check for mercurial and a mercurial repo.
-        if hgid=`hg id 2>/dev/null`; then
+        if test -d .hg && hgid=`hg id 2>/dev/null`; then
-                tag=`printf '%s' "$hgid" | cut -d' ' -f2`
+                tag=`printf '%s' "$hgid" | cut -s -d' ' -f2`
                # Do we have an untagged version?
                if [ -z "$tag" -o "$tag" = tip ]; then