69 files changed, 4726 insertions, 795 deletions
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 0b94d2fa3a88..a1a5cf95a68d 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -82,7 +82,7 @@ ifneq ($(strip $(lib-y) $(lib-m) $(lib-n) $(lib-)),)
 lib-target := $(obj)/lib.a
 endif
-ifneq ($(strip $(obj-y) $(obj-m) $(obj-n) $(obj-) $(lib-target)),)
+ifneq ($(strip $(obj-y) $(obj-m) $(obj-n) $(obj-) $(subdir-m) $(lib-target)),)
 builtin-target := $(obj)/built-in.o
 endif
@@ -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.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.lib b/scripts/Makefile.lib
index f9bdf264473d..54fd1b700131 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -241,7 +241,11 @@ cmd_lzma = (cat $(filter-out FORCE,$^) | \
        lzma -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
        (rm -f $@ ; false)
-quiet_cmd_lzo = LZO    $@
+quiet_cmd_lzo = LZO     $@
 cmd_lzo = (cat $(filter-out FORCE,$^) | \
        lzop -9 && $(call size_append, $(filter-out FORCE,$^))) > $@ || \
        (rm -f $@ ; false)
+# misc stuff
+# ---------------------------------------------------------------------------
+quote:="
diff --git a/scripts/Makefile.modbuiltin b/scripts/Makefile.modbuiltin
index 102a276f6eea..1adb974e6950 100644
--- a/scripts/Makefile.modbuiltin
+++ b/scripts/Makefile.modbuiltin
@@ -14,6 +14,11 @@ __modbuiltin:
 include scripts/Kbuild.include
+ifneq ($(KBUILD_SRC),)
+# Create output directory if not already present
+_dummy := $(shell [ -d $(obj) ] || mkdir -p $(obj))
+endif
 # The filename Kbuild has precedence over Makefile
 kbuild-dir := $(if $(filter /%,$(src)),$(src),$(srctree)/$(src))
 kbuild-file := $(if $(wildcard $(kbuild-dir)/Kbuild),$(kbuild-dir)/Kbuild,$(kbuild-dir)/Makefile)
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/checkincludes.pl b/scripts/checkincludes.pl
index 676ddc07d6fa..97b2c6143fe4 100755
--- a/scripts/checkincludes.pl
+++ b/scripts/checkincludes.pl
@@ -11,6 +11,8 @@
 # you do have real dups and do not have them under #ifdef's. You
 # could also just review the results.
+use strict;
 sub usage {
        print "Usage: checkincludes.pl [-r]\n";
        print "By default we just warn of duplicates\n";
@@ -35,23 +37,24 @@ if ($#ARGV >= 1) {
        }
 }
-foreach $file (@ARGV) {
+foreach my $file (@ARGV) {
-        open(FILE, $file) or die "Cannot open $file: $!.\n";
+        open(my $f, '<', $file)
+            or die "Cannot open $file: $!.\n";
        my %includedfiles = ();
        my @file_lines = ();
-        while (<FILE>) {
+        while (<$f>) {
                if (m/^\s*#\s*include\s*[<"](\S*)[>"]/o) {
                        ++$includedfiles{$1};
                }
                push(@file_lines, $_);
        }
-        close(FILE);
+        close($f);
        if (!$remove) {
-                foreach $filename (keys %includedfiles) {
+                foreach my $filename (keys %includedfiles) {
                        if ($includedfiles{$filename} > 1) {
                                print "$file: $filename is included more than once.\n";
                        }
@@ -59,27 +62,28 @@ foreach $file (@ARGV) {
                next;
        }
-        open(FILE,">$file") || die("Cannot write to $file: $!");
+        open($f, '>', $file)
+            or die("Cannot write to $file: $!");
        my $dups = 0;
        foreach (@file_lines) {
                if (m/^\s*#\s*include\s*[<"](\S*)[>"]/o) {
-                        foreach $filename (keys %includedfiles) {
+                        foreach my $filename (keys %includedfiles) {
                                if ($1 eq $filename) {
                                        if ($includedfiles{$filename} > 1) {
                                                $includedfiles{$filename}--;
                                                $dups++;
                                        } else {
-                                                print FILE $_;
+                                                print {$f} $_;
                                        }
                                }
                        }
                } else {
-                        print FILE $_;
+                        print {$f} $_;
                }
        }
        if ($dups > 0) {
                print "$file: removed $dups duplicate includes\n";
        }
-        close(FILE);
+        close($f);
 }
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 a4d74344d805..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;
                        }
                }
@@ -1382,13 +1391,29 @@ sub process {
                        ERROR("trailing whitespace\n" . $herevet);
                }
+# check for Kconfig help text having a real description
+                if ($realfile =~ /Kconfig/ &&
+                    $line =~ /\+?\s*(---)?help(---)?$/) {
+                        my $length = 0;
+                        for (my $l = $linenr; defined($lines[$l]); $l++) {
+                                my $f = $lines[$l];
+                                $f =~ s/#.*//;
+                                $f =~ s/^\s+//;
+                                next if ($f =~ /^$/);
+                                last if ($f =~ /^\s*config\s/);
+                                $length++;
+                        }
+                        WARN("please write a paragraph that describes the config symbol fully\n" . $herecurr) if ($length < 4);
+                }
 # check we are in a valid source file if not then ignore this hunk
                next if ($realfile !~ /\.(h|c|s|S|pl|sh)$/);
 #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);
@@ -1433,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)$/);
@@ -1763,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.
@@ -2293,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);
@@ -2555,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";
@@ -2586,6 +2633,11 @@ sub process {
                        CHK("architecture specific defines should be avoided\n" .  $herecurr);
                }
+# Check that the storage class is at the beginning of a declaration
+                if ($line =~ /\b$Storage\b/ && $line !~ /^.\s*$Storage\b/) {
+                        WARN("storage class should be at the beginning of the declaration\n" . $herecurr)
+                }
 # check the location of the inline attribute, that it is between
 # storage class and type.
                if ($line =~ /\b$Type\s+$Inline\b/ ||
@@ -2656,6 +2708,7 @@ sub process {
 # check for semaphores used as mutexes
                if ($line =~ /^.\s*init_MUTEX_LOCKED\s*\(/) {
                        WARN("consider using a completion\n" . $herecurr);
                }
 # recommend strict_strto* over simple_strto*
                if ($line =~ /\bsimple_(strto.*?)\s*\(/) {
@@ -2740,6 +2793,16 @@ sub process {
                                WARN("use of in_atomic() is incorrect outside core kernel code\n" . $herecurr);
                        }
                }
+# check for lockdep_set_novalidate_class
+                if ($line =~ /^.\s*lockdep_set_novalidate_class\s*\(/ ||
+                    $line =~ /__lockdep_no_validate__\s*\)/ ) {
+                        if ($realfile !~ m@^kernel/lockdep@ &&
+                            $realfile !~ m@^include/linux/lockdep@ &&
+                            $realfile !~ m@^drivers/base/core@) {
+                                ERROR("lockdep_no_validate class is reserved for device->mutex.\n" . $herecurr);
+                        }
+                }
        }
        # If we have no input at all, then there is nothing to report on
diff --git a/scripts/checkstack.pl b/scripts/checkstack.pl
index 14ee68e991dd..1afff6658a7d 100755
--- a/scripts/checkstack.pl
+++ b/scripts/checkstack.pl
@@ -21,6 +21,8 @@
 #
 #       TODO :  Port to all architectures (one regex per arch)
+use strict;
 # check for arch
 #
 # $re is used for two matches:
@@ -104,19 +106,11 @@ my (@stack, $re, $dre, $x, $xs);
        }
 }
-sub bysize($) {
-        my ($asize, $bsize);
-        ($asize = $a) =~ s/.*:  *(.*)$/$1/;
-        ($bsize = $b) =~ s/.*:  *(.*)$/$1/;
-        $bsize <=> $asize
-}
 #
 # main()
 #
 my $funcre = qr/^$x* <(.*)>:$/;
-my $func;
+my ($func, $file, $lastslash);
-my $file, $lastslash;
 while (my $line = <STDIN>) {
        if ($line =~ m/$funcre/) {
@@ -173,4 +167,6 @@ while (my $line = <STDIN>) {
        }
 }
-print sort bysize @stack;
+# Sort output by size (last field)
+print sort { ($b =~ /:\t*(\d+)$/)[0] <=> ($a =~ /:\t*(\d+)$/)[0] } @stack;
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/checkversion.pl b/scripts/checkversion.pl
index ec7d21161bdc..b444e89a0095 100755
--- a/scripts/checkversion.pl
+++ b/scripts/checkversion.pl
@@ -5,23 +5,22 @@
 # including <linux/version.h> that don't need it.
 # Copyright (C) 2003, Randy Dunlap <rdunlap@xenotime.net>
+use strict;
 $| = 1;
-my $debugging = 0;
+my $debugging;
-foreach $file (@ARGV)
+foreach my $file (@ARGV) {
-{
    # Open this file.
-    open(FILE, $file) || die "Can't open $file: $!\n";
+    open( my $f, '<', $file )
+      or die "Can't open $file: $!\n";
    # Initialize variables.
-    my $fInComment   = 0;
+    my ($fInComment, $fInString, $fUseVersion);
-    my $fInString    = 0;
-    my $fUseVersion   = 0;
    my $iLinuxVersion = 0;
-    LINE: while ( <FILE> )
+    while (<$f>) {
-    {
        # Strip comments.
        $fInComment && (s+^.*?\*/+ +o ? ($fInComment = 0) : next);
        m+/\*+o && (s+/\*.*?\*/+ +go, (s+/\*.*$+ +o && ($fInComment = 1)));
@@ -43,8 +42,8 @@ foreach $file (@ARGV)
        # Look for uses: LINUX_VERSION_CODE, KERNEL_VERSION, UTS_RELEASE
        if (($_ =~ /LINUX_VERSION_CODE/) || ($_ =~ /\WKERNEL_VERSION/)) {
            $fUseVersion = 1;
-            last LINE if $iLinuxVersion;
+            last if $iLinuxVersion;
-        }
+        }
    }
    # Report used version IDs without include?
@@ -67,5 +66,5 @@ foreach $file (@ARGV)
        }
    }
-    close(FILE);
+    close($f);
 }
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 4b00647814bc..18ba881c3415 100755
--- a/scripts/decodecode
+++ b/scripts/decodecode
@@ -7,7 +7,7 @@
 # AFLAGS=--32 decodecode < 386.oops
 cleanup() {
-        rm -f $T $T.s $T.o $T.oo $T.aa  $T.aaa
+        rm -f $T $T.s $T.o $T.oo $T.aa $T.dis
        exit 1
 }
@@ -39,6 +39,29 @@ fi
 echo $code
 code=`echo $code | sed -e 's/.*Code: //'`
+width=`expr index "$code" ' '`
+width=$((($width-1)/2))
+case $width in
+1) type=byte ;;
+2) type=2byte ;;
+4) type=4byte ;;
+esac
+disas() {
+        ${CROSS_COMPILE}as $AFLAGS -o $1.o $1.s > /dev/null 2>&1
+        if [ "$ARCH" = "arm" ]; then
+                if [ $width -eq 2 ]; then
+                        OBJDUMPFLAGS="-M force-thumb"
+                fi
+                ${CROSS_COMPILE}strip $1.o
+        fi
+        ${CROSS_COMPILE}objdump $OBJDUMPFLAGS -S $1.o | \
+                grep -v "/tmp\|Disassembly\|\.text\|^$" > $1.dis 2>&1
+}
 marker=`expr index "$code" "\<"`
 if [ $marker -eq 0 ]; then
        marker=`expr index "$code" "\("`
@@ -49,26 +72,25 @@ if [ $marker -ne 0 ]; then
        echo All code >> $T.oo
        echo ======== >> $T.oo
        beforemark=`echo "$code"`
-        echo -n "       .byte 0x" > $T.s
+        echo -n "       .$type 0x" > $T.s
-        echo $beforemark | sed -e 's/ /,0x/g' | sed -e 's/<//g' | sed -e 's/>//g' >> $T.s
+        echo $beforemark | sed -e 's/ /,0x/g; s/[<>()]//g' >> $T.s
-        as $AFLAGS -o $T.o $T.s &> /dev/null
+        disas $T
-        objdump -S $T.o | grep -v "/tmp" | grep -v "Disassembly" | grep -v "\.text" | grep -v "^$" &> $T.ooo
+        cat $T.dis >> $T.oo
-        cat $T.ooo >> $T.oo
+        rm -f $T.o $T.s $T.dis
-        rm -f $T.o $T.s  $T.ooo
 # and fix code at-and-after marker
        code=`echo "$code" | cut -c$((${marker} + 1))-`
 fi
 echo Code starting with the faulting instruction  > $T.aa
 echo =========================================== >> $T.aa
-code=`echo $code | sed -e 's/ [<(]/ /;s/[>)] / /;s/ /,0x/g'`
+code=`echo $code | sed -e 's/ [<(]/ /;s/[>)] / /;s/ /,0x/g; s/[>)]$//'`
-echo -n "       .byte 0x" > $T.s
+echo -n "       .$type 0x" > $T.s
 echo $code >> $T.s
-as $AFLAGS -o $T.o $T.s &> /dev/null
+disas $T
-objdump -S $T.o | grep -v "Disassembly" | grep -v "/tmp" | grep -v "\.text" | grep -v "^$" &> $T.aaa
+cat $T.dis >> $T.aa
-cat $T.aaa >> $T.aa
-faultline=`cat $T.aaa | head -1 | cut -d":" -f2`
+faultline=`cat $T.dis | head -1 | cut -d":" -f2`
+faultline=`echo "$faultline" | sed -e 's/\[/\\\[/g; s/\]/\\\]/g'`
 cat $T.oo | sed -e "s/\($faultline\)/\*\1     <-- trapping instruction/g"
 echo
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/export_report.pl b/scripts/export_report.pl
index 705b5ba7c152..04dce7c15f83 100644
--- a/scripts/export_report.pl
+++ b/scripts/export_report.pl
@@ -49,10 +49,10 @@ sub usage {
 }
 sub collectcfiles {
-        my @file = `cat .tmp_versions/*.mod | grep '.*\.ko\$'`;
+    my @file
-        @file = grep {s/\.ko/.mod.c/} @file;
+        = `cat .tmp_versions/*.mod | grep '.*\.ko\$' | sed s/\.ko$/.mod.c/`;
-        chomp @file;
+    chomp @file;
-        return @file;
+    return @file;
 }
 my (%SYMBOL, %MODULE, %opt, @allcfiles);
@@ -71,37 +71,40 @@ if (not defined $opt{'k'}) {
        $opt{'k'} = "Module.symvers";
 }
-unless (open(MODULE_SYMVERS, $opt{'k'})) {
+open (my $module_symvers, '<', $opt{'k'})
-        die "Sorry, cannot open $opt{'k'}: $!\n";
+    or die "Sorry, cannot open $opt{'k'}: $!\n";
-}
 if (defined $opt{'o'}) {
-        unless (open(OUTPUT_HANDLE, ">$opt{'o'}")) {
+    open (my $out, '>', $opt{'o'})
-                die "Sorry, cannot open $opt{'o'} $!\n";
+        or die "Sorry, cannot open $opt{'o'} $!\n";
-        }
-        select OUTPUT_HANDLE;
+    select $out;
 }
 #
 # collect all the symbols and their attributes from the
 # Module.symvers file
 #
-while ( <MODULE_SYMVERS> ) {
+while ( <$module_symvers> ) {
        chomp;
        my (undef, $symbol, $module, $gpl) = split;
        $SYMBOL { $symbol } =  [ $module , "0" , $symbol, $gpl];
 }
-close(MODULE_SYMVERS);
+close($module_symvers);
 #
 # collect the usage count of each symbol.
 #
 foreach my $thismod (@allcfiles) {
-        unless (open(MODULE_MODULE, $thismod)) {
+        my $module;
-                print "Sorry, cannot open $thismod: $!\n";
+        unless (open ($module, '<', $thismod)) {
+                warn "Sorry, cannot open $thismod: $!\n";
                next;
        }
        my $state=0;
-        while ( <MODULE_MODULE> ) {
+        while ( <$module> ) {
                chomp;
                if ($state == 0) {
                        $state = 1 if ($_ =~ /static const struct modversion_info/);
@@ -124,7 +127,7 @@ foreach my $thismod (@allcfiles) {
        if ($state != 2) {
                print "WARNING:$thismod is not built with CONFIG_MODVERSION enabled\n";
        }
-        close(MODULE_MODULE);
+        close($module);
 }
 print "\tThis file reports the exported symbols usage patterns by in-tree\n",
diff --git a/scripts/gen_initramfs_list.sh b/scripts/gen_initramfs_list.sh
index 76af5f9623e3..5958fffb2114 100644
--- a/scripts/gen_initramfs_list.sh
+++ b/scripts/gen_initramfs_list.sh
@@ -202,6 +202,7 @@ input_file() {
                        print_mtime "$1" >> ${output}
                        cat "$1"         >> ${output}
                else
+                        echo "$1 \\"
                        cat "$1" | while read type dir file perm ; do
                                if [ "$type" == "file" ]; then
                                        echo "$file \\";
@@ -231,7 +232,7 @@ arg="$1"
 case "$arg" in
        "-l")   # files included in initramfs - used by kbuild
                dep_list="list_"
-                echo "deps_initramfs := \\"
+                echo "deps_initramfs := $0 \\"
                shift
                ;;
        "-o")   # generate compressed cpio image named $1
@@ -242,6 +243,7 @@ case "$arg" in
                echo "$output_file" | grep -q "\.gz$" && compr="gzip -9 -f"
                echo "$output_file" | grep -q "\.bz2$" && compr="bzip2 -9 -f"
                echo "$output_file" | grep -q "\.lzma$" && compr="lzma -9 -f"
+                echo "$output_file" | grep -q "\.lzo$" && compr="lzop -9 -f"
                echo "$output_file" | grep -q "\.cpio$" && compr="cat"
                shift
                ;;
diff --git a/scripts/genksyms/genksyms.c b/scripts/genksyms/genksyms.c
index af6b8363a2d5..f99115ebe925 100644
--- a/scripts/genksyms/genksyms.c
+++ b/scripts/genksyms/genksyms.c
@@ -758,8 +758,10 @@ int main(int argc, char **argv)
                /* setlinebuf(debugfile); */
        }
-        if (flag_reference)
+        if (flag_reference) {
                read_reference(ref_file);
+                fclose(ref_file);
+        }
        yyparse();
diff --git a/scripts/get_maintainer.pl b/scripts/get_maintainer.pl
index 6f97a13bcee4..b2281982f52f 100755
--- a/scripts/get_maintainer.pl
+++ b/scripts/get_maintainer.pl
@@ -13,7 +13,7 @@
 use strict;
 my $P = $0;
-my $V = '0.23';
+my $V = '0.24';
 use Getopt::Long qw(:config no_auto_abbrev);
@@ -25,6 +25,7 @@ my $email_list = 1;
 my $email_subscriber_list = 0;
 my $email_git_penguin_chiefs = 0;
 my $email_git = 1;
+my $email_git_all_signature_types = 0;
 my $email_git_blame = 0;
 my $email_git_min_signatures = 1;
 my $email_git_max_maintainers = 5;
@@ -51,9 +52,9 @@ my $help = 0;
 my $exit = 0;
 my @penguin_chief = ();
-push(@penguin_chief,"Linus Torvalds:torvalds\@linux-foundation.org");
+push(@penguin_chief, "Linus Torvalds:torvalds\@linux-foundation.org");
 #Andrew wants in on most everything - 2009/01/14
-#push(@penguin_chief,"Andrew Morton:akpm\@linux-foundation.org");
+#push(@penguin_chief, "Andrew Morton:akpm\@linux-foundation.org");
 my @penguin_chief_names = ();
 foreach my $chief (@penguin_chief) {
@@ -63,7 +64,16 @@ foreach my $chief (@penguin_chief) {
        push(@penguin_chief_names, $chief_name);
    }
 }
-my $penguin_chiefs = "\(" . join("|",@penguin_chief_names) . "\)";
+my $penguin_chiefs = "\(" . join("|", @penguin_chief_names) . "\)";
+# Signature types of people who are either
+#       a) responsible for the code in question, or
+#       b) familiar enough with it to give relevant feedback
+my @signature_tags = ();
+push(@signature_tags, "Signed-off-by:");
+push(@signature_tags, "Reviewed-by:");
+push(@signature_tags, "Acked-by:");
+my $signaturePattern = "\(" . join("|", @signature_tags) . "\)";
 # rfc822 email address - preloaded methods go here.
 my $rfc822_lwsp = "(?:(?:\\r\\n)?[ \\t])";
@@ -97,9 +107,34 @@ my %VCS_cmds_hg = (
    "blame_commit_pattern" => "^([0-9a-f]+):"
 );
+if (-f "${lk_path}.get_maintainer.conf") {
+    my @conf_args;
+    open(my $conffile, '<', "${lk_path}.get_maintainer.conf")
+        or warn "$P: Can't open .get_maintainer.conf: $!\n";
+    while (<$conffile>) {
+        my $line = $_;
+        $line =~ s/\s*\n?$//g;
+        $line =~ s/^\s*//g;
+        $line =~ s/\s+/ /g;
+        next if ($line =~ m/^\s*#/);
+        next if ($line =~ m/^\s*$/);
+        my @words = split(" ", $line);
+        foreach my $word (@words) {
+            last if ($word =~ m/^#/);
+            push (@conf_args, $word);
+        }
+    }
+    close($conffile);
+    unshift(@ARGV, @conf_args) if @conf_args;
+}
 if (!GetOptions(
                'email!' => \$email,
                'git!' => \$email_git,
+                'git-all-signature-types!' => \$email_git_all_signature_types,
                'git-blame!' => \$email_git_blame,
                'git-chief-penguins!' => \$email_git_penguin_chiefs,
                'git-min-signatures=i' => \$email_git_min_signatures,
@@ -180,6 +215,10 @@ if (!top_of_kernel_tree($lk_path)) {
        . "a linux kernel source tree.\n";
 }
+if ($email_git_all_signature_types) {
+    $signaturePattern = "(.+?)[Bb][Yy]:";
+}
 ## Read MAINTAINERS for type/value pairs
 my @typevalue = ();
@@ -497,13 +536,15 @@ version: $V
 MAINTAINER field selection options:
  --email => print email address(es) if any
    --git => include recent git \*-by: signers
+    --git-all-signature-types => include signers regardless of signature type
+        or use only ${signaturePattern} signers (default: $email_git_all_signature_types)
    --git-chief-penguins => include ${penguin_chiefs}
-    --git-min-signatures => number of signatures required (default: 1)
+    --git-min-signatures => number of signatures required (default: $email_git_min_signatures)
-    --git-max-maintainers => maximum maintainers to add (default: 5)
+    --git-max-maintainers => maximum maintainers to add (default: $email_git_max_maintainers)
-    --git-min-percent => minimum percentage of commits required (default: 5)
+    --git-min-percent => minimum percentage of commits required (default: $email_git_min_percent)
    --git-blame => use git blame to find modified commits for patch or file
-    --git-since => git history to use (default: 1-year-ago)
+    --git-since => git history to use (default: $email_git_since)
-    --hg-since => hg history to use (default: -365)
+    --hg-since => hg history to use (default: $email_hg_since)
    --m => include maintainer(s) if any
    --n => include name 'Full Name <addr\@domain.tld>'
    --l => include list(s) if any
@@ -556,6 +597,11 @@ Notes:
          --git-min-signatures, --git-max-maintainers, --git-min-percent, and
          --git-blame
      Use --hg-since not --git-since to control date selection
+  File ".get_maintainer.conf", if it exists in the linux kernel source root
+      directory, can change whatever get_maintainer defaults are desired.
+      Entries in this file can be any command line argument.
+      This file is prepended to any additional command line arguments.
+      Multiple lines and # comments are allowed.
 EOT
 }
@@ -964,7 +1010,7 @@ sub vcs_find_signers {
    $commits = grep(/$pattern/, @lines);        # of commits
-    @lines = grep(/^[-_         a-z]+by:.*\@.*$/i, @lines);
+    @lines = grep(/^[ \t]*${signaturePattern}.*\@.*$/, @lines);
    if (!$email_git_penguin_chiefs) {
        @lines = grep(!/${penguin_chiefs}/i, @lines);
    }
diff --git a/scripts/headerdep.pl b/scripts/headerdep.pl
index b7f6c560e24d..8dd019bc5a73 100755
--- a/scripts/headerdep.pl
+++ b/scripts/headerdep.pl
@@ -80,8 +80,7 @@ sub search {
                my $path = "$i/$filename";
                return $path if -f $path;
        }
+        return;
-        return undef;
 }
 sub parse_all {
diff --git a/scripts/headers_check.pl b/scripts/headers_check.pl
index db1dd7a549f2..50d6cfd1fa77 100644
--- a/scripts/headers_check.pl
+++ b/scripts/headers_check.pl
@@ -28,11 +28,12 @@ my $lineno = 0;
 my $filename;
 foreach my $file (@files) {
-        local *FH;
        $filename = $file;
-        open(FH, "<$filename") or die "$filename: $!\n";
+        open(my $fh, '<', $filename)
+                or die "$filename: $!\n";
        $lineno = 0;
-        while ($line = <FH>) {
+        while ($line = <$fh>) {
                $lineno++;
                &check_include();
                &check_asm_types();
@@ -40,7 +41,7 @@ foreach my $file (@files) {
                &check_declarations();
                # Dropped for now. Too much noise &check_config();
        }
-        close FH;
+        close $fh;
 }
 exit $ret;
@@ -78,7 +79,7 @@ sub check_config
 }
 my $linux_asm_types;
-sub check_asm_types()
+sub check_asm_types
 {
        if ($filename =~ /types.h|int-l64.h|int-ll64.h/o) {
                return;
diff --git a/scripts/headers_install.pl b/scripts/headers_install.pl
index b89ca2c58fdb..4ca3be3b2e50 100644
--- a/scripts/headers_install.pl
+++ b/scripts/headers_install.pl
@@ -23,13 +23,13 @@ my ($readdir, $installdir, $arch, @files) = @ARGV;
 my $unifdef = "scripts/unifdef -U__KERNEL__ -D__EXPORTED_HEADERS__";
 foreach my $file (@files) {
-        local *INFILE;
-        local *OUTFILE;
        my $tmpfile = "$installdir/$file.tmp";
-        open(INFILE, "<$readdir/$file")
-                or die "$readdir/$file: $!\n";
+        open(my $in, '<', "$readdir/$file")
-        open(OUTFILE, ">$tmpfile") or die "$tmpfile: $!\n";
+            or die "$readdir/$file: $!\n";
-        while (my $line = <INFILE>) {
+        open(my $out, '>', $tmpfile)
+            or die "$tmpfile: $!\n";
+        while (my $line = <$in>) {
                $line =~ s/([\s(])__user\s/$1/g;
                $line =~ s/([\s(])__force\s/$1/g;
                $line =~ s/([\s(])__iomem\s/$1/g;
@@ -39,10 +39,11 @@ foreach my $file (@files) {
                $line =~ s/(^|\s)(inline)\b/$1__$2__/g;
                $line =~ s/(^|\s)(asm)\b(\s|[(]|$)/$1__$2__$3/g;
                $line =~ s/(^|\s|[(])(volatile)\b(\s|[(]|$)/$1__$2__$3/g;
-                printf OUTFILE "%s", $line;
+                printf {$out} "%s", $line;
        }
-        close OUTFILE;
+        close $out;
-        close INFILE;
+        close $in;
        system $unifdef . " $tmpfile > $installdir/$file";
        unlink $tmpfile;
 }
diff --git a/scripts/kallsyms.c b/scripts/kallsyms.c
index 86c3896a1e01..e3902fb39afd 100644
--- a/scripts/kallsyms.c
+++ b/scripts/kallsyms.c
@@ -108,8 +108,10 @@ static int read_symbol(FILE *in, struct sym_entry *s)
        rc = fscanf(in, "%llx %c %499s\n", &s->addr, &stype, str);
        if (rc != 3) {
                if (rc != EOF) {
-                        /* skip line */
+                        /* skip line. sym is used as dummy to
-                        fgets(str, 500, in);
+                         * shut of "warn_unused_result" warning.
+                         */
+                        sym = fgets(str, 500, in);
                }
                return -1;
        }
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 186c46604d06..de934def410f 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -21,14 +21,17 @@ menuconfig: $(obj)/mconf
        $< $(Kconfig)
 config: $(obj)/conf
+        $< --oldaskconfig $(Kconfig)
+nconfig: $(obj)/nconf
        $< $(Kconfig)
 oldconfig: $(obj)/conf
-        $< -o $(Kconfig)
+        $< --$@ $(Kconfig)
 silentoldconfig: $(obj)/conf
        $(Q)mkdir -p include/generated
-        $< -s $(Kconfig)
+        $< --$@ $(Kconfig)
 # if no path is given, then use src directory to find file
 ifdef LSMOD
@@ -41,15 +44,15 @@ endif
 localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
        $(Q)mkdir -p include/generated
        $(Q)perl $< $(srctree) $(Kconfig) $(LSMOD_F) > .tmp.config
-        $(Q)if [ -f .config ]; then                             \
+        $(Q)if [ -f .config ]; then                                     \
-                        cmp -s .tmp.config .config ||           \
+                        cmp -s .tmp.config .config ||                   \
-                        (mv -f .config .config.old.1;           \
+                        (mv -f .config .config.old.1;                   \
-                         mv -f .tmp.config .config;             \
+                         mv -f .tmp.config .config;                     \
-                         $(obj)/conf -s $(Kconfig);             \
+                         $(obj)/conf --silentoldconfig $(Kconfig);      \
-                         mv -f .config.old.1 .config.old)       \
+                         mv -f .config.old.1 .config.old)               \
-        else                                                    \
+        else                                                            \
-                        mv -f .tmp.config .config;              \
+                        mv -f .tmp.config .config;                      \
-                        $(obj)/conf -s $(Kconfig);              \
+                        $(obj)/conf --silentoldconfig $(Kconfig);       \
        fi
        $(Q)rm -f .tmp.config
@@ -57,15 +60,15 @@ localyesconfig: $(obj)/streamline_config.pl $(obj)/conf
        $(Q)mkdir -p include/generated
        $(Q)perl $< $(srctree) $(Kconfig) $(LSMOD_F) > .tmp.config
        $(Q)sed -i s/=m/=y/ .tmp.config
-        $(Q)if [ -f .config ]; then                             \
+        $(Q)if [ -f .config ]; then                                     \
-                        cmp -s .tmp.config .config ||           \
+                        cmp -s .tmp.config .config ||                   \
-                        (mv -f .config .config.old.1;           \
+                        (mv -f .config .config.old.1;                   \
-                         mv -f .tmp.config .config;             \
+                         mv -f .tmp.config .config;                     \
-                         $(obj)/conf -s $(Kconfig);             \
+                         $(obj)/conf --silentoldconfig $(Kconfig);      \
-                         mv -f .config.old.1 .config.old)       \
+                         mv -f .config.old.1 .config.old)               \
-        else                                                    \
+        else                                                            \
-                        mv -f .tmp.config .config;              \
+                        mv -f .tmp.config .config;                      \
-                        $(obj)/conf -s $(Kconfig);              \
+                        $(obj)/conf --silentoldconfig $(Kconfig);       \
        fi
        $(Q)rm -f .tmp.config
@@ -92,34 +95,34 @@ update-po-config: $(obj)/kxgettext $(obj)/gconf.glade.h
        $(Q)rm -f arch/um/Kconfig.arch
        $(Q)rm -f $(obj)/config.pot
-PHONY += randconfig allyesconfig allnoconfig allmodconfig defconfig
+PHONY += allnoconfig allyesconfig allmodconfig alldefconfig randconfig
-randconfig: $(obj)/conf
+allnoconfig allyesconfig allmodconfig alldefconfig randconfig: $(obj)/conf
-        $< -r $(Kconfig)
+        $< --$@ $(Kconfig)
-allyesconfig: $(obj)/conf
+PHONY += listnewconfig oldnoconfig savedefconfig defconfig
-        $< -y $(Kconfig)
-allnoconfig: $(obj)/conf
+listnewconfig oldnoconfig: $(obj)/conf
-        $< -n $(Kconfig)
+        $< --$@ $(Kconfig)
-allmodconfig: $(obj)/conf
+savedefconfig: $(obj)/conf
-        $< -m $(Kconfig)
+        $< --$@=defconfig $(Kconfig)
 defconfig: $(obj)/conf
 ifeq ($(KBUILD_DEFCONFIG),)
-        $< -d $(Kconfig)
+        $< --defconfig $(Kconfig)
 else
        @echo "*** Default configuration is based on '$(KBUILD_DEFCONFIG)'"
-        $(Q)$< -D arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig)
+        $(Q)$< --defconfig=arch/$(SRCARCH)/configs/$(KBUILD_DEFCONFIG) $(Kconfig)
 endif
 %_defconfig: $(obj)/conf
-        $(Q)$< -D arch/$(SRCARCH)/configs/$@ $(Kconfig)
+        $(Q)$< --defconfig=arch/$(SRCARCH)/configs/$@ $(Kconfig)
 # Help text used by make help
 help:
        @echo  '  config          - Update current config utilising a line-oriented program'
+        @echo  '  nconfig         - Update current config utilising a ncurses menu based program'
        @echo  '  menuconfig      - Update current config utilising a menu based program'
        @echo  '  xconfig         - Update current config utilising a QT based front-end'
        @echo  '  gconfig         - Update current config utilising a GTK based front-end'
@@ -127,11 +130,15 @@ help:
        @echo  '  localmodconfig  - Update current config disabling modules not loaded'
        @echo  '  localyesconfig  - Update current config converting local mods to core'
        @echo  '  silentoldconfig - Same as oldconfig, but quietly, additionally update deps'
-        @echo  '  randconfig      - New config with random answer to all options'
+        @echo  '  defconfig       - New config with default from ARCH supplied defconfig'
-        @echo  '  defconfig       - New config with default answer to all options'
+        @echo  '  savedefconfig   - Save current config as ./defconfig (minimal config)'
-        @echo  '  allmodconfig    - New config selecting modules when possible'
-        @echo  '  allyesconfig    - New config where all options are accepted with yes'
        @echo  '  allnoconfig     - New config where all options are answered with no'
+        @echo  '  allyesconfig    - New config where all options are accepted with yes'
+        @echo  '  allmodconfig    - New config selecting modules when possible'
+        @echo  '  alldefconfig    - New config with all symbols set to default'
+        @echo  '  randconfig      - New config with random answer to all options'
+        @echo  '  listnewconfig   - List new options'
+        @echo  '  oldnoconfig     - Same as silentoldconfig but set new symbols to n (unset)'
 # lxdialog stuff
 check-lxdialog  := $(srctree)/$(src)/lxdialog/check-lxdialog.sh
@@ -147,6 +154,8 @@ HOST_EXTRACFLAGS += -DLOCALE
 # ===========================================================================
 # Shared Makefile for the various kconfig executables:
 # conf:   Used for defconfig, oldconfig and related targets
+# nconf:  Used for the nconfig target.
+#         Utilizes ncurses
 # mconf:  Used for the menuconfig target
 #         Utilizes the lxdialog package
 # qconf:  Used for the xconfig target
@@ -159,11 +168,16 @@ lxdialog := lxdialog/checklist.o lxdialog/util.o lxdialog/inputbox.o
 lxdialog += lxdialog/textbox.o lxdialog/yesno.o lxdialog/menubox.o
 conf-objs       := conf.o  zconf.tab.o
-mconf-objs      := mconf.o zconf.tab.o $(lxdialog)
+mconf-objs     := mconf.o zconf.tab.o $(lxdialog)
+nconf-objs     := nconf.o zconf.tab.o nconf.gui.o
 kxgettext-objs  := kxgettext.o zconf.tab.o
 hostprogs-y := conf qconf gconf kxgettext
+ifeq ($(MAKECMDGOALS),nconfig)
+        hostprogs-y += nconf
+endif
 ifeq ($(MAKECMDGOALS),menuconfig)
        hostprogs-y += mconf
 endif
@@ -187,7 +201,7 @@ endif
 clean-files     := lkc_defs.h qconf.moc .tmp_qtcheck \
                   .tmp_gtkcheck zconf.tab.c lex.zconf.c zconf.hash.c gconf.glade.h
-clean-files     += mconf qconf gconf
+clean-files     += mconf qconf gconf nconf
 clean-files     += config.pot linux.pot
 # Check that we have the required ncurses stuff installed for lxdialog (menuconfig)
@@ -208,10 +222,11 @@ HOSTCFLAGS_zconf.tab.o	:= -I$(src)
 HOSTLOADLIBES_qconf     = $(KC_QT_LIBS) -ldl
 HOSTCXXFLAGS_qconf.o    = $(KC_QT_CFLAGS) -D LKC_DIRECT_LINK
-HOSTLOADLIBES_gconf     = `pkg-config --libs gtk+-2.0 gmodule-2.0 libglade-2.0`
+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_nconf     = -lmenu -lpanel -lncurses
 $(obj)/qconf.o: $(obj)/.tmp_qtcheck
 ifeq ($(qconf-target),1)
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 9960d1c303f8..274f2716b03e 100644
--- a/scripts/kconfig/conf.c
+++ b/scripts/kconfig/conf.c
@@ -10,6 +10,7 @@
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
+#include <getopt.h>
 #include <sys/stat.h>
 #include <sys/time.h>
@@ -19,16 +20,21 @@
 static void conf(struct menu *menu);
 static void check_conf(struct menu *menu);
-enum {
+enum input_mode {
-        ask_all,
+        oldaskconfig,
-        ask_new,
+        silentoldconfig,
-        ask_silent,
+        oldconfig,
-        set_default,
+        allnoconfig,
-        set_yes,
+        allyesconfig,
-        set_mod,
+        allmodconfig,
-        set_no,
+        alldefconfig,
-        set_random
+        randconfig,
-} input_mode = ask_all;
+        defconfig,
+        savedefconfig,
+        listnewconfig,
+        oldnoconfig,
+} input_mode = oldaskconfig;
 char *defconfig_file;
 static int indent = 1;
@@ -93,14 +99,14 @@ static int conf_askvalue(struct symbol *sym, const char *def)
        }
        switch (input_mode) {
-        case ask_new:
+        case oldconfig:
-        case ask_silent:
+        case silentoldconfig:
                if (sym_has_value(sym)) {
                        printf("%s\n", def);
                        return 0;
                }
                check_stdin();
-        case ask_all:
+        case oldaskconfig:
                fflush(stdout);
                fgets(line, 128, stdin);
                return 1;
@@ -156,14 +162,12 @@ static int conf_string(struct menu *menu)
 static int conf_sym(struct menu *menu)
 {
        struct symbol *sym = menu->sym;
-        int type;
        tristate oldval, newval;
        while (1) {
                printf("%*s%s ", indent - 1, "", _(menu->prompt->text));
                if (sym->name)
                        printf("(%s) ", sym->name);
-                type = sym_get_type(sym);
                putchar('[');
                oldval = sym_get_tristate_value(sym);
                switch (oldval) {
@@ -228,11 +232,9 @@ static int conf_choice(struct menu *menu)
 {
        struct symbol *sym, *def_sym;
        struct menu *child;
-        int type;
        bool is_new;
        sym = menu->sym;
-        type = sym_get_type(sym);
        is_new = !sym_has_value(sym);
        if (sym_is_changable(sym)) {
                conf_sym(menu);
@@ -294,15 +296,15 @@ static int conf_choice(struct menu *menu)
                        printf("?");
                printf("]: ");
                switch (input_mode) {
-                case ask_new:
+                case oldconfig:
-                case ask_silent:
+                case silentoldconfig:
                        if (!is_new) {
                                cnt = def;
                                printf("%d\n", cnt);
                                break;
                        }
                        check_stdin();
-                case ask_all:
+                case oldaskconfig:
                        fflush(stdout);
                        fgets(line, 128, stdin);
                        strip(line);
@@ -360,7 +362,10 @@ static void conf(struct menu *menu)
                switch (prop->type) {
                case P_MENU:
-                        if (input_mode == ask_silent && rootEntry != menu) {
+                        if ((input_mode == silentoldconfig ||
+                             input_mode == listnewconfig ||
+                             input_mode == oldnoconfig) &&
+                            rootEntry != menu) {
                                check_conf(menu);
                                return;
                        }
@@ -418,10 +423,16 @@ static void check_conf(struct menu *menu)
        if (sym && !sym_has_value(sym)) {
                if (sym_is_changable(sym) ||
                    (sym_is_choice(sym) && sym_get_tristate_value(sym) == yes)) {
-                        if (!conf_cnt++)
+                        if (input_mode == listnewconfig) {
-                                printf(_("*\n* Restart config...\n*\n"));
+                                if (sym->name && !sym_is_choice_value(sym)) {
-                        rootEntry = menu_get_parent_menu(menu);
+                                        printf("CONFIG_%s\n", sym->name);
-                        conf(rootEntry);
+                                }
+                        } else {
+                                if (!conf_cnt++)
+                                        printf(_("*\n* Restart config...\n*\n"));
+                                rootEntry = menu_get_parent_menu(menu);
+                                conf(rootEntry);
+                        }
                }
        }
@@ -429,6 +440,22 @@ static void check_conf(struct menu *menu)
                check_conf(child);
 }
+static struct option long_opts[] = {
+        {"oldaskconfig",    no_argument,       NULL, oldaskconfig},
+        {"oldconfig",       no_argument,       NULL, oldconfig},
+        {"silentoldconfig", no_argument,       NULL, silentoldconfig},
+        {"defconfig",       optional_argument, NULL, defconfig},
+        {"savedefconfig",   required_argument, NULL, savedefconfig},
+        {"allnoconfig",     no_argument,       NULL, allnoconfig},
+        {"allyesconfig",    no_argument,       NULL, allyesconfig},
+        {"allmodconfig",    no_argument,       NULL, allmodconfig},
+        {"alldefconfig",    no_argument,       NULL, alldefconfig},
+        {"randconfig",      no_argument,       NULL, randconfig},
+        {"listnewconfig",   no_argument,       NULL, listnewconfig},
+        {"oldnoconfig",     no_argument,       NULL, oldnoconfig},
+        {NULL, 0, NULL, 0}
+};
 int main(int ac, char **av)
 {
        int opt;
@@ -439,32 +466,17 @@ int main(int ac, char **av)
        bindtextdomain(PACKAGE, LOCALEDIR);
        textdomain(PACKAGE);
-        while ((opt = getopt(ac, av, "osdD:nmyrh")) != -1) {
+        while ((opt = getopt_long_only(ac, av, "", long_opts, NULL)) != -1) {
+                input_mode = (enum input_mode)opt;
                switch (opt) {
-                case 'o':
+                case silentoldconfig:
-                        input_mode = ask_silent;
-                        break;
-                case 's':
-                        input_mode = ask_silent;
                        sync_kconfig = 1;
                        break;
-                case 'd':
+                case defconfig:
-                        input_mode = set_default;
+                case savedefconfig:
-                        break;
-                case 'D':
-                        input_mode = set_default;
                        defconfig_file = optarg;
                        break;
-                case 'n':
+                case randconfig:
-                        input_mode = set_no;
-                        break;
-                case 'm':
-                        input_mode = set_mod;
-                        break;
-                case 'y':
-                        input_mode = set_yes;
-                        break;
-                case 'r':
                {
                        struct timeval now;
                        unsigned int seed;
@@ -477,17 +489,12 @@ int main(int ac, char **av)
                        seed = (unsigned int)((now.tv_sec + 1) * (now.tv_usec + 1));
                        srand(seed);
-                        input_mode = set_random;
                        break;
                }
-                case 'h':
+                case '?':
-                        printf(_("See README for usage info\n"));
-                        exit(0);
-                        break;
-                default:
                        fprintf(stderr, _("See README for usage info\n"));
                        exit(1);
+                        break;
                }
        }
        if (ac == optind) {
@@ -512,7 +519,7 @@ int main(int ac, char **av)
        }
        switch (input_mode) {
-        case set_default:
+        case defconfig:
                if (!defconfig_file)
                        defconfig_file = conf_get_default_confname();
                if (conf_read(defconfig_file)) {
@@ -522,25 +529,32 @@ int main(int ac, char **av)
                        exit(1);
                }
                break;
-        case ask_silent:
+        case savedefconfig:
-        case ask_all:
+                conf_read(NULL);
-        case ask_new:
+                break;
+        case silentoldconfig:
+        case oldaskconfig:
+        case oldconfig:
+        case listnewconfig:
+        case oldnoconfig:
                conf_read(NULL);
                break;
-        case set_no:
+        case allnoconfig:
-        case set_mod:
+        case allyesconfig:
-        case set_yes:
+        case allmodconfig:
-        case set_random:
+        case alldefconfig:
+        case randconfig:
                name = getenv("KCONFIG_ALLCONFIG");
                if (name && !stat(name, &tmpstat)) {
                        conf_read_simple(name, S_DEF_USER);
                        break;
                }
                switch (input_mode) {
-                case set_no:     name = "allno.config"; break;
+                case allnoconfig:       name = "allno.config"; break;
-                case set_mod:    name = "allmod.config"; break;
+                case allyesconfig:      name = "allyes.config"; break;
-                case set_yes:    name = "allyes.config"; break;
+                case allmodconfig:      name = "allmod.config"; break;
-                case set_random: name = "allrandom.config"; break;
+                case alldefconfig:      name = "alldef.config"; break;
+                case randconfig:        name = "allrandom.config"; break;
                default: break;
                }
                if (!stat(name, &tmpstat))
@@ -565,33 +579,42 @@ int main(int ac, char **av)
        }
        switch (input_mode) {
-        case set_no:
+        case allnoconfig:
                conf_set_all_new_symbols(def_no);
                break;
-        case set_yes:
+        case allyesconfig:
                conf_set_all_new_symbols(def_yes);
                break;
-        case set_mod:
+        case allmodconfig:
                conf_set_all_new_symbols(def_mod);
                break;
-        case set_random:
+        case alldefconfig:
+                conf_set_all_new_symbols(def_default);
+                break;
+        case randconfig:
                conf_set_all_new_symbols(def_random);
                break;
-        case set_default:
+        case defconfig:
                conf_set_all_new_symbols(def_default);
                break;
-        case ask_new:
+        case savedefconfig:
-        case ask_all:
+                break;
+        case oldaskconfig:
                rootEntry = &rootmenu;
                conf(&rootmenu);
-                input_mode = ask_silent;
+                input_mode = silentoldconfig;
                /* fall through */
-        case ask_silent:
+        case oldconfig:
+        case listnewconfig:
+        case oldnoconfig:
+        case silentoldconfig:
                /* Update until a loop caused no more changes */
                do {
                        conf_cnt = 0;
                        check_conf(&rootmenu);
-                } while (conf_cnt);
+                } while (conf_cnt &&
+                         (input_mode != listnewconfig &&
+                          input_mode != oldnoconfig));
                break;
        }
@@ -607,7 +630,13 @@ int main(int ac, char **av)
                        fprintf(stderr, _("\n*** Error during update of the kernel configuration.\n\n"));
                        return 1;
                }
-        } else {
+        } else if (input_mode == savedefconfig) {
+                if (conf_write_defconfig(defconfig_file)) {
+                        fprintf(stderr, _("n*** Error while saving defconfig to: %s\n\n"),
+                                defconfig_file);
+                        return 1;
+                }
+        } else if (input_mode != listnewconfig) {
                if (conf_write(NULL)) {
                        fprintf(stderr, _("\n*** Error during writing of the kernel configuration.\n\n"));
                        exit(1);
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c
index c4dec80cfd8e..f81f263b64f2 100644
--- a/scripts/kconfig/confdata.c
+++ b/scripts/kconfig/confdata.c
@@ -170,8 +170,11 @@ int conf_read_simple(const char *name, int def)
                if (in)
                        goto load;
                sym_add_change_count(1);
-                if (!sym_defconfig_list)
+                if (!sym_defconfig_list) {
+                        if (modules_sym)
+                                sym_calc_value(modules_sym);
                        return 1;
+                }
                for_all_defaults(sym_defconfig_list, prop) {
                        if (expr_calc_value(prop->visible.expr) == no ||
@@ -396,15 +399,149 @@ int conf_read(const char *name)
        return 0;
 }
+/* Write a S_STRING */
+static void conf_write_string(bool headerfile, const char *name,
+                              const char *str, FILE *out)
+{
+        int l;
+        if (headerfile)
+                fprintf(out, "#define CONFIG_%s \"", name);
+        else
+                fprintf(out, "CONFIG_%s=\"", name);
+        while (1) {
+                l = strcspn(str, "\"\\");
+                if (l) {
+                        fwrite(str, l, 1, out);
+                        str += l;
+                }
+                if (!*str)
+                        break;
+                fprintf(out, "\\%c", *str++);
+        }
+        fputs("\"\n", out);
+}
+static void conf_write_symbol(struct symbol *sym, enum symbol_type type,
+                              FILE *out, bool write_no)
+{
+        const char *str;
+        switch (type) {
+        case S_BOOLEAN:
+        case S_TRISTATE:
+                switch (sym_get_tristate_value(sym)) {
+                case no:
+                        if (write_no)
+                                fprintf(out, "# CONFIG_%s is not set\n", sym->name);
+                        break;
+                case mod:
+                        fprintf(out, "CONFIG_%s=m\n", sym->name);
+                        break;
+                case yes:
+                        fprintf(out, "CONFIG_%s=y\n", sym->name);
+                        break;
+                }
+                break;
+        case S_STRING:
+                conf_write_string(false, sym->name, sym_get_string_value(sym), out);
+                break;
+        case S_HEX:
+        case S_INT:
+                str = sym_get_string_value(sym);
+                fprintf(out, "CONFIG_%s=%s\n", sym->name, str);
+                break;
+        case S_OTHER:
+        case S_UNKNOWN:
+                break;
+        }
+}
+/*
+ * Write out a minimal config.
+ * All values that has default values are skipped as this is redundant.
+ */
+int conf_write_defconfig(const char *filename)
+{
+        struct symbol *sym;
+        struct menu *menu;
+        FILE *out;
+        out = fopen(filename, "w");
+        if (!out)
+                return 1;
+        sym_clear_all_valid();
+        /* Traverse all menus to find all relevant symbols */
+        menu = rootmenu.list;
+        while (menu != NULL)
+        {
+                sym = menu->sym;
+                if (sym == NULL) {
+                        if (!menu_is_visible(menu))
+                                goto next_menu;
+                } else if (!sym_is_choice(sym)) {
+                        sym_calc_value(sym);
+                        if (!(sym->flags & SYMBOL_WRITE))
+                                goto next_menu;
+                        sym->flags &= ~SYMBOL_WRITE;
+                        /* If we cannot change the symbol - skip */
+                        if (!sym_is_changable(sym))
+                                goto next_menu;
+                        /* If symbol equals to default value - skip */
+                        if (strcmp(sym_get_string_value(sym), sym_get_string_default(sym)) == 0)
+                                goto next_menu;
+                        /*
+                         * If symbol is a choice value and equals to the
+                         * default for a choice - skip.
+                         * But only if value equal to "y".
+                         */
+                        if (sym_is_choice_value(sym)) {
+                                struct symbol *cs;
+                                struct symbol *ds;
+                                cs = prop_get_symbol(sym_get_choice_prop(sym));
+                                ds = sym_choice_default(cs);
+                                if (sym == ds) {
+                                        if ((sym->type == S_BOOLEAN ||
+                                        sym->type == S_TRISTATE) &&
+                                        sym_get_tristate_value(sym) == yes)
+                                                goto next_menu;
+                                }
+                        }
+                        conf_write_symbol(sym, sym->type, out, true);
+                }
+next_menu:
+                if (menu->list != NULL) {
+                        menu = menu->list;
+                }
+                else if (menu->next != NULL) {
+                        menu = menu->next;
+                } else {
+                        while ((menu = menu->parent)) {
+                                if (menu->next != NULL) {
+                                        menu = menu->next;
+                                        break;
+                                }
+                        }
+                }
+        }
+        fclose(out);
+        return 0;
+}
 int conf_write(const char *name)
 {
        FILE *out;
        struct symbol *sym;
        struct menu *menu;
        const char *basename;
-        char dirname[128], tmpname[128], newname[128];
-        int type, l;
        const char *str;
+        char dirname[128], tmpname[128], newname[128];
+        enum symbol_type type;
        time_t now;
        int use_timestamp = 1;
        char *env;
@@ -484,50 +621,11 @@ int conf_write(const char *name)
                                if (modules_sym->curr.tri == no)
                                        type = S_BOOLEAN;
                        }
-                        switch (type) {
+                        /* Write config symbol to file */
-                        case S_BOOLEAN:
+                        conf_write_symbol(sym, type, out, true);
-                        case S_TRISTATE:
-                                switch (sym_get_tristate_value(sym)) {
-                                case no:
-                                        fprintf(out, "# CONFIG_%s is not set\n", sym->name);
-                                        break;
-                                case mod:
-                                        fprintf(out, "CONFIG_%s=m\n", sym->name);
-                                        break;
-                                case yes:
-                                        fprintf(out, "CONFIG_%s=y\n", sym->name);
-                                        break;
-                                }
-                                break;
-                        case S_STRING:
-                                str = sym_get_string_value(sym);
-                                fprintf(out, "CONFIG_%s=\"", sym->name);
-                                while (1) {
-                                        l = strcspn(str, "\"\\");
-                                        if (l) {
-                                                fwrite(str, l, 1, out);
-                                                str += l;
-                                        }
-                                        if (!*str)
-                                                break;
-                                        fprintf(out, "\\%c", *str++);
-                                }
-                                fputs("\"\n", out);
-                                break;
-                        case S_HEX:
-                                str = sym_get_string_value(sym);
-                                if (str[0] != '0' || (str[1] != 'x' && str[1] != 'X')) {
-                                        fprintf(out, "CONFIG_%s=%s\n", sym->name, str);
-                                        break;
-                                }
-                        case S_INT:
-                                str = sym_get_string_value(sym);
-                                fprintf(out, "CONFIG_%s=%s\n", sym->name, str);
-                                break;
-                        }
                }
-        next:
+next:
                if (menu->list) {
                        menu = menu->list;
                        continue;
@@ -679,7 +777,7 @@ int conf_write_autoconf(void)
        const char *name;
        FILE *out, *tristate, *out_h;
        time_t now;
-        int i, l;
+        int i;
        sym_clear_all_valid();
@@ -729,6 +827,11 @@ int conf_write_autoconf(void)
                sym_calc_value(sym);
                if (!(sym->flags & SYMBOL_WRITE) || !sym->name)
                        continue;
+                /* write symbol to config file */
+                conf_write_symbol(sym, sym->type, out, false);
+                /* update autoconf and tristate files */
                switch (sym->type) {
                case S_BOOLEAN:
                case S_TRISTATE:
@@ -736,12 +839,10 @@ int conf_write_autoconf(void)
                        case no:
                                break;
                        case mod:
-                                fprintf(out, "CONFIG_%s=m\n", sym->name);
                                fprintf(tristate, "CONFIG_%s=M\n", sym->name);
                                fprintf(out_h, "#define CONFIG_%s_MODULE 1\n", sym->name);
                                break;
                        case yes:
-                                fprintf(out, "CONFIG_%s=y\n", sym->name);
                                if (sym->type == S_TRISTATE)
                                        fprintf(tristate, "CONFIG_%s=Y\n",
                                                        sym->name);
@@ -750,35 +851,16 @@ int conf_write_autoconf(void)
                        }
                        break;
                case S_STRING:
-                        str = sym_get_string_value(sym);
+                        conf_write_string(true, sym->name, sym_get_string_value(sym), out_h);
-                        fprintf(out, "CONFIG_%s=\"", sym->name);
-                        fprintf(out_h, "#define CONFIG_%s \"", sym->name);
-                        while (1) {
-                                l = strcspn(str, "\"\\");
-                                if (l) {
-                                        fwrite(str, l, 1, out);
-                                        fwrite(str, l, 1, out_h);
-                                        str += l;
-                                }
-                                if (!*str)
-                                        break;
-                                fprintf(out, "\\%c", *str);
-                                fprintf(out_h, "\\%c", *str);
-                                str++;
-                        }
-                        fputs("\"\n", out);
-                        fputs("\"\n", out_h);
                        break;
                case S_HEX:
                        str = sym_get_string_value(sym);
                        if (str[0] != '0' || (str[1] != 'x' && str[1] != 'X')) {
-                                fprintf(out, "CONFIG_%s=%s\n", sym->name, str);
                                fprintf(out_h, "#define CONFIG_%s 0x%s\n", sym->name, str);
                                break;
                        }
                case S_INT:
                        str = sym_get_string_value(sym);
-                        fprintf(out, "CONFIG_%s=%s\n", sym->name, str);
                        fprintf(out_h, "#define CONFIG_%s %s\n", sym->name, str);
                        break;
                default:
@@ -862,7 +944,8 @@ void conf_set_all_new_symbols(enum conf_def_mode mode)
                                sym->def[S_DEF_USER].tri = no;
                                break;
                        case def_random:
-                                sym->def[S_DEF_USER].tri = (tristate)(rand() % 3);
+                                cnt = sym_get_type(sym) == S_TRISTATE ? 3 : 2;
+                                sym->def[S_DEF_USER].tri = (tristate)(rand() % cnt);
                                break;
                        default:
                                continue;
diff --git a/scripts/kconfig/expr.c b/scripts/kconfig/expr.c
index edd3f39a080a..8f18e37892cb 100644
--- a/scripts/kconfig/expr.c
+++ b/scripts/kconfig/expr.c
@@ -1097,9 +1097,32 @@ void expr_fprint(struct expr *e, FILE *out)
 static void expr_print_gstr_helper(void *data, struct symbol *sym, const char *str)
 {
-        str_append((struct gstr*)data, str);
+        struct gstr *gs = (struct gstr*)data;
+        const char *sym_str = NULL;
        if (sym)
-                str_printf((struct gstr*)data, " [=%s]", sym_get_string_value(sym));
+                sym_str = sym_get_string_value(sym);
+        if (gs->max_width) {
+                unsigned extra_length = strlen(str);
+                const char *last_cr = strrchr(gs->s, '\n');
+                unsigned last_line_length;
+                if (sym_str)
+                        extra_length += 4 + strlen(sym_str);
+                if (!last_cr)
+                        last_cr = gs->s;
+                last_line_length = strlen(gs->s) - (last_cr - gs->s);
+                if ((last_line_length + extra_length) > gs->max_width)
+                        str_append(gs, "\\\n");
+        }
+        str_append(gs, str);
+        if (sym && sym->type != S_UNKNOWN)
+                str_printf(gs, " [=%s]", sym_str);
 }
 void expr_gstr_print(struct expr *e, struct gstr *gs)
diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h
index 6408fefae083..6ee2e4fb1481 100644
--- a/scripts/kconfig/expr.h
+++ b/scripts/kconfig/expr.h
@@ -83,10 +83,11 @@ struct symbol {
        tristate visible;
        int flags;
        struct property *prop;
+        struct expr_value dir_dep;
        struct expr_value rev_dep;
 };
-#define for_all_symbols(i, sym) for (i = 0; i < 257; i++) for (sym = symbol_hash[i]; sym; sym = sym->next) if (sym->type != S_OTHER)
+#define for_all_symbols(i, sym) for (i = 0; i < SYMBOL_HASHSIZE; i++) for (sym = symbol_hash[i]; sym; sym = sym->next) if (sym->type != S_OTHER)
 #define SYMBOL_CONST      0x0001  /* symbol is const */
 #define SYMBOL_CHECK      0x0008  /* used during dependency checking */
@@ -108,8 +109,7 @@ struct symbol {
 #define SYMBOL_DEF4       0x80000  /* symbol.def[S_DEF_4] is valid */
 #define SYMBOL_MAXLENGTH        256
-#define SYMBOL_HASHSIZE         257
+#define SYMBOL_HASHSIZE         9973
-#define SYMBOL_HASHMASK         0xff
 /* A property represent the config options that can be associated
 * with a config "symbol".
@@ -132,6 +132,7 @@ enum prop_type {
        P_SELECT,   /* select BAR */
        P_RANGE,    /* range 7..100 (for a symbol) */
        P_ENV,      /* value from environment variable */
+        P_SYMBOL,   /* where a symbol is defined */
 };
 struct property {
@@ -164,6 +165,7 @@ 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 65464366fe38..d66988265f89 100644
--- a/scripts/kconfig/gconf.c
+++ b/scripts/kconfig/gconf.c
@@ -30,13 +30,16 @@ enum {
        SINGLE_VIEW, SPLIT_VIEW, FULL_VIEW
 };
+enum {
+        OPT_NORMAL, OPT_ALL, OPT_PROMPT
+};
 static gint view_mode = FULL_VIEW;
 static gboolean show_name = TRUE;
 static gboolean show_range = TRUE;
 static gboolean show_value = TRUE;
-static gboolean show_all = FALSE;
-static gboolean show_debug = FALSE;
 static gboolean resizeable = FALSE;
+static int opt_mode = OPT_NORMAL;
 GtkWidget *main_wnd = NULL;
 GtkWidget *tree1_w = NULL;      // left  frame
@@ -76,36 +79,7 @@ static void conf_changed(void);
 /* Helping/Debugging Functions */
+const char *dbg_sym_flags(int val)
-const char *dbg_print_stype(int val)
-{
-        static char buf[256];
-        bzero(buf, 256);
-        if (val == S_UNKNOWN)
-                strcpy(buf, "unknown");
-        if (val == S_BOOLEAN)
-                strcpy(buf, "boolean");
-        if (val == S_TRISTATE)
-                strcpy(buf, "tristate");
-        if (val == S_INT)
-                strcpy(buf, "int");
-        if (val == S_HEX)
-                strcpy(buf, "hex");
-        if (val == S_STRING)
-                strcpy(buf, "string");
-        if (val == S_OTHER)
-                strcpy(buf, "other");
-#ifdef DEBUG
-        printf("%s", buf);
-#endif
-        return buf;
-}
-const char *dbg_print_flags(int val)
 {
        static char buf[256];
@@ -131,40 +105,10 @@ const char *dbg_print_flags(int val)
                strcat(buf, "auto/");
        buf[strlen(buf) - 1] = '\0';
-#ifdef DEBUG
-        printf("%s", buf);
-#endif
-        return buf;
-}
-const char *dbg_print_ptype(int val)
-{
-        static char buf[256];
-        bzero(buf, 256);
-        if (val == P_UNKNOWN)
-                strcpy(buf, "unknown");
-        if (val == P_PROMPT)
-                strcpy(buf, "prompt");
-        if (val == P_COMMENT)
-                strcpy(buf, "comment");
-        if (val == P_MENU)
-                strcpy(buf, "menu");
-        if (val == P_DEFAULT)
-                strcpy(buf, "default");
-        if (val == P_CHOICE)
-                strcpy(buf, "choice");
-#ifdef DEBUG
-        printf("%s", buf);
-#endif
        return buf;
 }
 void replace_button_icon(GladeXML * xml, GdkDrawable * window,
                         GtkStyle * style, gchar * btn_name, gchar ** xpm)
 {
@@ -697,20 +641,29 @@ void on_show_data1_activate(GtkMenuItem * menuitem, gpointer user_data)
 void
-on_show_all_options1_activate(GtkMenuItem * menuitem, gpointer user_data)
+on_set_option_mode1_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
-        show_all = GTK_CHECK_MENU_ITEM(menuitem)->active;
+        opt_mode = OPT_NORMAL;
+        gtk_tree_store_clear(tree2);
+        display_tree(&rootmenu);        /* instead of update_tree to speed-up */
+}
+void
+on_set_option_mode2_activate(GtkMenuItem *menuitem, gpointer user_data)
+{
+        opt_mode = OPT_ALL;
        gtk_tree_store_clear(tree2);
-        display_tree(&rootmenu);        // instead of update_tree to speed-up
+        display_tree(&rootmenu);        /* instead of update_tree to speed-up */
 }
 void
-on_show_debug_info1_activate(GtkMenuItem * menuitem, gpointer user_data)
+on_set_option_mode3_activate(GtkMenuItem *menuitem, gpointer user_data)
 {
-        show_debug = GTK_CHECK_MENU_ITEM(menuitem)->active;
+        opt_mode = OPT_PROMPT;
-        update_tree(&rootmenu, NULL);
+        gtk_tree_store_clear(tree2);
+        display_tree(&rootmenu);        /* instead of update_tree to speed-up */
 }
@@ -1161,9 +1114,12 @@ static gchar **fill_row(struct menu *menu)
        row[COL_OPTION] =
            g_strdup_printf("%s %s", _(menu_get_prompt(menu)),
-                            sym && sym_has_value(sym) ? "(NEW)" : "");
+                            sym && !sym_has_value(sym) ? "(NEW)" : "");
-        if (show_all && !menu_is_visible(menu))
+        if (opt_mode == OPT_ALL && !menu_is_visible(menu))
+                row[COL_COLOR] = g_strdup("DarkGray");
+        else if (opt_mode == OPT_PROMPT &&
+                        menu_has_prompt(menu) && !menu_is_visible(menu))
                row[COL_COLOR] = g_strdup("DarkGray");
        else
                row[COL_COLOR] = g_strdup("Black");
@@ -1386,16 +1342,20 @@ static void update_tree(struct menu *src, GtkTreeIter * dst)
                       menu2 ? menu_get_prompt(menu2) : "nil");
 #endif
-                if (!menu_is_visible(child1) && !show_all) {    // remove node
+                if ((opt_mode == OPT_NORMAL && !menu_is_visible(child1)) ||
+                    (opt_mode == OPT_PROMPT && !menu_has_prompt(child1)) ||
+                    (opt_mode == OPT_ALL    && !menu_get_prompt(child1))) {
+                        /* remove node */
                        if (gtktree_iter_find_node(dst, menu1) != NULL) {
                                memcpy(&tmp, child2, sizeof(GtkTreeIter));
                                valid = gtk_tree_model_iter_next(model2,
                                                                 child2);
                                gtk_tree_store_remove(tree2, &tmp);
                                if (!valid)
-                                        return; // next parent
+                                        return;         /* next parent */
                                else
-                                        goto reparse;   // next child
+                                        goto reparse;   /* next child */
                        } else
                                continue;
                }
@@ -1464,17 +1424,19 @@ static void display_tree(struct menu *menu)
                    && (tree == tree2))
                        continue;
-                if (menu_is_visible(child) || show_all)
+                if ((opt_mode == OPT_NORMAL && menu_is_visible(child)) ||
+                    (opt_mode == OPT_PROMPT && menu_has_prompt(child)) ||
+                    (opt_mode == OPT_ALL    && menu_get_prompt(child)))
                        place_node(child, fill_row(child));
 #ifdef DEBUG
                printf("%*c%s: ", indent, ' ', menu_get_prompt(child));
                printf("%s", child->flags & MENU_ROOT ? "rootmenu | " : "");
-                dbg_print_ptype(ptype);
+                printf("%s", prop_get_type_name(ptype));
                printf(" | ");
                if (sym) {
-                        dbg_print_stype(sym->type);
+                        printf("%s", sym_type_name(sym->type));
                        printf(" | ");
-                        dbg_print_flags(sym->flags);
+                        printf("%s", dbg_sym_flags(sym->flags));
                        printf("\n");
                } else
                        printf("\n");
diff --git a/scripts/kconfig/gconf.glade b/scripts/kconfig/gconf.glade
index b1c86c19292c..d52b0a75d824 100644
--- a/scripts/kconfig/gconf.glade
+++ b/scripts/kconfig/gconf.glade
@@ -190,26 +190,40 @@
                  </child>
                  <child>
-                    <widget class="GtkCheckMenuItem" id="show_all_options1">
+                    <widget class="GtkRadioMenuItem" id="set_option_mode1">
+                      <property name="visible">True</property>
+                      <property name="tooltip" translatable="yes">Show normal options</property>
+                      <property name="label" translatable="yes">Show normal options</property>
+                      <property name="use_underline">True</property>
+                      <property name="active">True</property>
+                      <signal name="activate" handler="on_set_option_mode1_activate"/>
+                    </widget>
+                  </child>
+                  <child>
+                    <widget class="GtkRadioMenuItem" id="set_option_mode2">
                      <property name="visible">True</property>
                      <property name="tooltip" translatable="yes">Show all options</property>
                      <property name="label" translatable="yes">Show all _options</property>
                      <property name="use_underline">True</property>
                      <property name="active">False</property>
-                      <signal name="activate" handler="on_show_all_options1_activate"/>
+                      <property name="group">set_option_mode1</property>
+                      <signal name="activate" handler="on_set_option_mode2_activate"/>
                    </widget>
                  </child>
                  <child>
-                    <widget class="GtkCheckMenuItem" id="show_debug_info1">
+                    <widget class="GtkRadioMenuItem" id="set_option_mode3">
                      <property name="visible">True</property>
-                      <property name="tooltip" translatable="yes">Show masked options</property>
+                      <property name="tooltip" translatable="yes">Show all options with prompts</property>
-                      <property name="label" translatable="yes">Show _debug info</property>
+                      <property name="label" translatable="yes">Show all prompt options</property>
                      <property name="use_underline">True</property>
                      <property name="active">False</property>
-                      <signal name="activate" handler="on_show_debug_info1_activate"/>
+                      <property name="group">set_option_mode1</property>
+                      <signal name="activate" handler="on_set_option_mode3_activate"/>
                    </widget>
                  </child>
                </widget>
              </child>
            </widget>
diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h
index f379b0bf8c9e..76db065ed72c 100644
--- a/scripts/kconfig/lkc.h
+++ b/scripts/kconfig/lkc.h
@@ -84,7 +84,7 @@ void conf_set_all_new_symbols(enum conf_def_mode mode);
 void kconfig_load(void);
 /* menu.c */
-void menu_init(void);
+void _menu_init(void);
 void menu_warn(struct menu *menu, const char *fmt, ...);
 struct menu *menu_add_menu(void);
 void menu_end_menu(void);
@@ -106,6 +106,11 @@ int file_write_dep(const char *name);
 struct gstr {
        size_t len;
        char  *s;
+        /*
+        * when max_width is not zero long lines in string s (if any) get
+        * wrapped not to exceed the max_width value
+        */
+        int max_width;
 };
 struct gstr str_new(void);
 struct gstr str_assign(const char *s);
@@ -121,6 +126,8 @@ void sym_init(void);
 void sym_clear_all_valid(void);
 void sym_set_all_changed(void);
 void sym_set_changed(struct symbol *sym);
+struct symbol *sym_choice_default(struct symbol *sym);
+const char *sym_get_string_default(struct symbol *sym);
 struct symbol *sym_check_deps(struct symbol *sym);
 struct property *prop_alloc(enum prop_type type, struct symbol *sym);
 struct symbol *prop_get_symbol(struct property *prop);
diff --git a/scripts/kconfig/lkc_proto.h b/scripts/kconfig/lkc_proto.h
index ffeb532b2cff..9a948c9ce44e 100644
--- a/scripts/kconfig/lkc_proto.h
+++ b/scripts/kconfig/lkc_proto.h
@@ -3,6 +3,7 @@
 P(conf_parse,void,(const char *name));
 P(conf_read,int,(const char *name));
 P(conf_read_simple,int,(const char *name, int));
+P(conf_write_defconfig,int,(const char *name));
 P(conf_write,int,(const char *name));
 P(conf_write_autoconf,int,(void));
 P(conf_get_changed,bool,(void));
@@ -11,13 +12,15 @@ P(conf_set_changed_callback, void,(void (*fn)(void)));
 /* menu.c */
 P(rootmenu,struct menu,);
-P(menu_is_visible,bool,(struct menu *menu));
+P(menu_is_visible, bool, (struct menu *menu));
+P(menu_has_prompt, bool, (struct menu *menu));
 P(menu_get_prompt,const char *,(struct menu *menu));
 P(menu_get_root_menu,struct menu *,(struct menu *menu));
 P(menu_get_parent_menu,struct menu *,(struct menu *menu));
 P(menu_has_help,bool,(struct menu *menu));
 P(menu_get_help,const char *,(struct menu *menu));
-P(get_symbol_str,void,(struct gstr *r, struct symbol *sym));
+P(get_symbol_str, void, (struct gstr *r, struct symbol *sym));
+P(get_relations_str, struct gstr, (struct symbol **sym_arr));
 P(menu_get_ext_help,void,(struct menu *menu, struct gstr *help));
 /* symbol.c */
diff --git a/scripts/kconfig/lxdialog/checklist.c b/scripts/kconfig/lxdialog/checklist.c
index bcc6f19c3a35..a2eb80fbc896 100644
--- a/scripts/kconfig/lxdialog/checklist.c
+++ b/scripts/kconfig/lxdialog/checklist.c
@@ -31,6 +31,10 @@ static int list_width, check_x, item_x;
 static void print_item(WINDOW * win, int choice, int selected)
 {
        int i;
+        char *list_item = malloc(list_width + 1);
+        strncpy(list_item, item_str(), list_width - item_x);
+        list_item[list_width - item_x] = '\0';
        /* Clear 'residue' of last item */
        wattrset(win, dlg.menubox.atr);
@@ -45,13 +49,14 @@ static void print_item(WINDOW * win, int choice, int selected)
                wprintw(win, "(%c)", item_is_tag('X') ? 'X' : ' ');
        wattrset(win, selected ? dlg.tag_selected.atr : dlg.tag.atr);
-        mvwaddch(win, choice, item_x, item_str()[0]);
+        mvwaddch(win, choice, item_x, list_item[0]);
        wattrset(win, selected ? dlg.item_selected.atr : dlg.item.atr);
-        waddstr(win, (char *)item_str() + 1);
+        waddstr(win, list_item + 1);
        if (selected) {
                wmove(win, choice, check_x + 1);
                wrefresh(win);
        }
+        free(list_item);
 }
 /*
@@ -175,6 +180,7 @@ do_resize:
        check_x = 0;
        item_foreach()
                check_x = MAX(check_x, strlen(item_str()) + 4);
+        check_x = MIN(check_x, list_width);
        check_x = (list_width - check_x) / 2;
        item_x = check_x + 4;
diff --git a/scripts/kconfig/lxdialog/inputbox.c b/scripts/kconfig/lxdialog/inputbox.c
index 616c60138183..dd8e587c50e2 100644
--- a/scripts/kconfig/lxdialog/inputbox.c
+++ b/scripts/kconfig/lxdialog/inputbox.c
@@ -180,7 +180,7 @@ do_resize:
                case KEY_LEFT:
                        switch (button) {
                        case -1:
-                                button = 1;     /* Indicates "Cancel" button is selected */
+                                button = 1;     /* Indicates "Help" button is selected */
                                print_buttons(dialog, height, width, 1);
                                break;
                        case 0:
@@ -204,7 +204,7 @@ do_resize:
                                print_buttons(dialog, height, width, 0);
                                break;
                        case 0:
-                                button = 1;     /* Indicates "Cancel" button is selected */
+                                button = 1;     /* Indicates "Help" button is selected */
                                print_buttons(dialog, height, width, 1);
                                break;
                        case 1:
diff --git a/scripts/kconfig/lxdialog/menubox.c b/scripts/kconfig/lxdialog/menubox.c
index fa9d633f293c..1d604738fa13 100644
--- a/scripts/kconfig/lxdialog/menubox.c
+++ b/scripts/kconfig/lxdialog/menubox.c
@@ -383,6 +383,10 @@ do_resize:
                case 'n':
                case 'm':
                case '/':
+                case 'h':
+                case '?':
+                case 'z':
+                case '\n':
                        /* save scroll info */
                        *s_scroll = scroll;
                        delwin(menu);
@@ -390,8 +394,10 @@ do_resize:
                        item_set(scroll + choice);
                        item_set_selected(1);
                        switch (key) {
+                        case 'h':
+                        case '?':
+                                return 2;
                        case 's':
-                                return 3;
                        case 'y':
                                return 3;
                        case 'n':
@@ -402,18 +408,12 @@ do_resize:
                                return 6;
                        case '/':
                                return 7;
+                        case 'z':
+                                return 8;
+                        case '\n':
+                                return button;
                        }
                        return 0;
-                case 'h':
-                case '?':
-                        button = 2;
-                case '\n':
-                        *s_scroll = scroll;
-                        delwin(menu);
-                        delwin(dialog);
-                        item_set(scroll + choice);
-                        item_set_selected(1);
-                        return button;
                case 'e':
                case 'x':
                        key = KEY_ESC;
diff --git a/scripts/kconfig/mconf.c b/scripts/kconfig/mconf.c
index 8413cf38ed27..d2f6e056c058 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -67,13 +67,15 @@ static const char mconf_readme[] = N_(
 "             there is a delayed response which you may find annoying.\n"
 "\n"
 "   Also, the <TAB> and cursor keys will cycle between <Select>,\n"
-"   <Exit> and <Help>\n"
+"   <Exit> and <Help>.\n"
 "\n"
 "o  To get help with an item, use the cursor keys to highlight <Help>\n"
-"   and Press <ENTER>.\n"
+"   and press <ENTER>.\n"
 "\n"
 "   Shortcut: Press <H> or <?>.\n"
 "\n"
+"o  To toggle the display of hidden options, press <Z>.\n"
+"\n"
 "\n"
 "Radiolists  (Choice lists)\n"
 "-----------\n"
@@ -272,6 +274,7 @@ static int indent;
 static struct menu *current_menu;
 static int child_count;
 static int single_menu_mode;
+static int show_all_options;
 static void conf(struct menu *menu);
 static void conf_choice(struct menu *menu);
@@ -282,19 +285,6 @@ static void show_textbox(const char *title, const char *text, int r, int c);
 static void show_helptext(const char *title, const char *text);
 static void show_help(struct menu *menu);
-static struct gstr get_relations_str(struct symbol **sym_arr)
-{
-        struct symbol *sym;
-        struct gstr res = str_new();
-        int i;
-        for (i = 0; sym_arr && (sym = sym_arr[i]); i++)
-                get_symbol_str(&res, sym);
-        if (!i)
-                str_append(&res, _("No matches found.\n"));
-        return res;
-}
 static char filename[PATH_MAX+1];
 static void set_config_filename(const char *config_filename)
 {
@@ -359,8 +349,16 @@ static void build_conf(struct menu *menu)
        int type, tmp, doint = 2;
        tristate val;
        char ch;
+        bool visible;
-        if (!menu_is_visible(menu))
+        /*
+         * note: menu_is_visible() has side effect that it will
+         * recalc the value of the symbol.
+         */
+        visible = menu_is_visible(menu);
+        if (show_all_options && !menu_has_prompt(menu))
+                return;
+        else if (!show_all_options && !visible)
                return;
        sym = menu->sym;
@@ -619,6 +617,9 @@ static void conf(struct menu *menu)
                case 7:
                        search_conf();
                        break;
+                case 8:
+                        show_all_options = !show_all_options;
+                        break;
                }
        }
 }
@@ -638,6 +639,7 @@ static void show_help(struct menu *menu)
 {
        struct gstr help = str_new();
+        help.max_width = getmaxx(stdscr) - 10;
        menu_get_ext_help(menu, &help);
        show_helptext(_(menu_get_prompt(menu)), str_get(&help));
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index 059a2465c574..4fb590247f33 100644
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -38,7 +38,7 @@ static void prop_warn(struct property *prop, const char *fmt, ...)
        va_end(ap);
 }
-void menu_init(void)
+void _menu_init(void)
 {
        current_entry = current_menu = &rootmenu;
        last_entry_ptr = &rootmenu.list;
@@ -58,6 +58,8 @@ void menu_add_entry(struct symbol *sym)
        *last_entry_ptr = menu;
        last_entry_ptr = &menu->next;
        current_entry = menu;
+        if (sym)
+                menu_add_symbol(P_SYMBOL, sym, NULL);
 }
 void menu_end_entry(void)
@@ -105,6 +107,7 @@ 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)
@@ -197,7 +200,7 @@ static void sym_check_prop(struct symbol *sym)
                        if ((sym->type == S_STRING || sym->type == S_INT || sym->type == S_HEX) &&
                            prop->expr->type != E_SYMBOL)
                                prop_warn(prop,
-                                    "default for config symbol '%'"
+                                    "default for config symbol '%s'"
                                    " must be a single symbol", sym->name);
                        break;
                case P_SELECT:
@@ -288,6 +291,10 @@ 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));
@@ -390,6 +397,13 @@ void menu_finalize(struct menu *parent)
        }
 }
+bool menu_has_prompt(struct menu *menu)
+{
+        if (!menu->prompt)
+                return false;
+        return true;
+}
 bool menu_is_visible(struct menu *menu)
 {
        struct menu *child;
@@ -398,6 +412,7 @@ bool menu_is_visible(struct menu *menu)
        if (!menu->prompt)
                return false;
        sym = menu->sym;
        if (sym) {
                sym_calc_value(sym);
@@ -407,12 +422,18 @@ bool menu_is_visible(struct menu *menu)
        if (visible != no)
                return true;
        if (!sym || sym_get_tristate_value(menu->sym) == no)
                return false;
-        for (child = menu->list; child; child = child->next)
+        for (child = menu->list; child; child = child->next) {
-                if (menu_is_visible(child))
+                if (menu_is_visible(child)) {
+                        if (sym)
+                                sym->flags |= SYMBOL_DEF_USER;
                        return true;
+                }
+        }
        return false;
 }
@@ -491,9 +512,19 @@ void get_symbol_str(struct gstr *r, struct symbol *sym)
        bool hit;
        struct property *prop;
-        if (sym && sym->name)
+        if (sym && sym->name) {
                str_printf(r, "Symbol: %s [=%s]\n", sym->name,
                           sym_get_string_value(sym));
+                str_printf(r, "Type  : %s\n", sym_type_name(sym->type));
+                if (sym->type == S_INT || sym->type == S_HEX) {
+                        prop = sym_get_range_prop(sym);
+                        if (prop) {
+                                str_printf(r, "Range : ");
+                                expr_gstr_print(prop->expr, r);
+                                str_append(r, "\n");
+                        }
+                }
+        }
        for_all_prompts(sym, prop)
                get_prompt_str(r, prop);
        hit = false;
@@ -515,6 +546,20 @@ void get_symbol_str(struct gstr *r, struct symbol *sym)
        str_append(r, "\n\n");
 }
+struct gstr get_relations_str(struct symbol **sym_arr)
+{
+        struct symbol *sym;
+        struct gstr res = str_new();
+        int i;
+        for (i = 0; sym_arr && (sym = sym_arr[i]); i++)
+                get_symbol_str(&res, sym);
+        if (!i)
+                str_append(&res, _("No matches found.\n"));
+        return res;
+}
 void menu_get_ext_help(struct menu *menu, struct gstr *help)
 {
        struct symbol *sym = menu->sym;
diff --git a/scripts/kconfig/nconf.c b/scripts/kconfig/nconf.c
new file mode 100644
index 000000000000..762caf80ce37
--- /dev/null
+++ b/scripts/kconfig/nconf.c
@@ -0,0 +1,1568 @@
+/*
+ * Copyright (C) 2008 Nir Tzachar <nir.tzachar@gmail.com?
+ * Released under the terms of the GNU GPL v2.0.
+ *
+ * Derived from menuconfig.
+ *
+ */
+#define LKC_DIRECT_LINK
+#include "lkc.h"
+#include "nconf.h"
+static const char nconf_readme[] = N_(
+"Overview\n"
+"--------\n"
+"Some kernel features may be built directly into the kernel.\n"
+"Some may be made into loadable runtime modules.  Some features\n"
+"may be completely removed altogether.  There are also certain\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"
+"  < > can be built in, modularized or removed\n"
+"  { } can be built in or modularized (selected by other feature)\n"
+"  - - are selected by other feature,\n"
+"  XXX cannot be selected. use Symbol Info to find out why,\n"
+"while *, M or whitespace inside braces means to build in, build as\n"
+"a module or to exclude the feature respectively.\n"
+"\n"
+"To change any of these features, highlight it with the cursor\n"
+"keys and press <Y> to build it in, <M> to make it a module or\n"
+"<N> to removed it.  You may also press the <Space Bar> to cycle\n"
+"through the available options (ie. Y->N->M->Y).\n"
+"\n"
+"Some additional keyboard hints:\n"
+"\n"
+"Menus\n"
+"----------\n"
+"o  Use the Up/Down arrow keys (cursor keys) to highlight the item\n"
+"   you wish to change use <Enter> or <Space>. Goto submenu by \n"
+"   pressing <Enter> of <right-arrow>. Use <Esc> or <left-arrow> to go back.\n"
+"   Submenus are designated by \"--->\".\n"
+"\n"
+"   Shortcut: Press the option's highlighted letter (hotkey).\n"
+"             Pressing a hotkey more than once will sequence\n"
+"             through all visible items which use that hotkey.\n"
+"\n"
+"   You may also use the <PAGE UP> and <PAGE DOWN> keys to scroll\n"
+"   unseen options into view.\n"
+"\n"
+"o  To exit a menu use the just press <ESC> <F5> <F8> or <left-arrow>.\n"
+"\n"
+"o  To get help with an item, press <F1>\n"
+"   Shortcut: Press <h> or <?>.\n"
+"\n"
+"\n"
+"Radiolists  (Choice lists)\n"
+"-----------\n"
+"o  Use the cursor keys to select the option you wish to set and press\n"
+"   <S> or the <SPACE BAR>.\n"
+"\n"
+"   Shortcut: Press the first letter of the option you wish to set then\n"
+"             press <S> or <SPACE BAR>.\n"
+"\n"
+"o  To see available help for the item, press <F1>\n"
+"   Shortcut: Press <H> or <?>.\n"
+"\n"
+"\n"
+"Data Entry\n"
+"-----------\n"
+"o  Enter the requested information and press <ENTER>\n"
+"   If you are entering hexadecimal values, it is not necessary to\n"
+"   add the '0x' prefix to the entry.\n"
+"\n"
+"o  For help, press <F1>.\n"
+"\n"
+"\n"
+"Text Box    (Help Window)\n"
+"--------\n"
+"o  Use the cursor keys to scroll up/down/left/right.  The VI editor\n"
+"   keys h,j,k,l function here as do <SPACE BAR> for those\n"
+"   who are familiar with less and lynx.\n"
+"\n"
+"o  Press <Enter>, <F1>, <F5>, <F7> or <Esc> to exit.\n"
+"\n"
+"\n"
+"Alternate Configuration Files\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"
+"\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"
+"The other option is for loading a previously saved alternate\n"
+"configuration.\n"
+"\n"
+"Even if you don't use alternate configuration files, but you\n"
+"find during a nconfig session that you have completely messed\n"
+"up your settings, you may use the \"Load Alternate...\" option to\n"
+"restore your previously saved settings from \".config\" without\n"
+"restarting nconfig.\n"
+"\n"
+"Other information\n"
+"-----------------\n"
+"If you use nconfig in an XTERM window make sure you have your\n"
+"$TERM variable set to point to a xterm definition which supports color.\n"
+"Otherwise, nconfig will look rather bad.  nconfig will not\n"
+"display correctly in a RXVT window because rxvt displays only one\n"
+"intensity of color, bright.\n"
+"\n"
+"nconfig will display larger menus on screens or xterms which are\n"
+"set to display more than the standard 25 row by 80 column geometry.\n"
+"In order for this to work, the \"stty size\" command must be able to\n"
+"display the screen's current row and column geometry.  I STRONGLY\n"
+"RECOMMEND that you make sure you do NOT have the shell variables\n"
+"LINES and COLUMNS exported into your environment.  Some distributions\n"
+"export those variables via /etc/profile.  Some ncurses programs can\n"
+"become confused when those variables (LINES & COLUMNS) don't reflect\n"
+"the true screen size.\n"
+"\n"
+"Optional personality available\n"
+"------------------------------\n"
+"If you prefer to have all of the kernel options listed in a single\n"
+"menu, rather than the default multimenu hierarchy, run the nconfig\n"
+"with NCONFIG_MODE environment variable set to single_menu. Example:\n"
+"\n"
+"make NCONFIG_MODE=single_menu nconfig\n"
+"\n"
+"<Enter> will then unroll the appropriate category, or enfold it if it\n"
+"is already unrolled.\n"
+"\n"
+"Note that this mode can eventually be a little more CPU expensive\n"
+"(especially with a larger number of unrolled categories) than the\n"
+"default mode.\n"
+"\n"),
+menu_no_f_instructions[] = N_(
+" You do not have function keys support. Please follow the\n"
+" following instructions:\n"
+" Arrow keys navigate the menu.\n"
+" <Enter> or <right-arrow> selects submenus --->.\n"
+" Capital Letters are hotkeys.\n"
+" Pressing <Y> includes, <N> excludes, <M> modularizes features.\n"
+" Pressing SpaceBar toggles between the above options\n"
+" Press <Esc> or <left-arrow> to go back one menu, \n"
+" <?> or <h> for Help, </> for Search.\n"
+" <1> is interchangable with <F1>, <2> with <F2>, etc.\n"
+" Legend: [*] built-in  [ ] excluded  <M> module  < > module capable.\n"
+" <Esc> always leaves the current window\n"),
+menu_instructions[] = N_(
+" Arrow keys navigate the menu.\n"
+" <Enter> or <right-arrow> selects submenus --->.\n"
+" Capital Letters are hotkeys.\n"
+" Pressing <Y> includes, <N> excludes, <M> modularizes features.\n"
+" Pressing SpaceBar toggles between the above options\n"
+" Press <Esc>, <F3> or <left-arrow> to go back one menu, \n"
+" <?>, <F1> or <h> for Help, </> for Search.\n"
+" <1> is interchangable with <F1>, <2> with <F2>, etc.\n"
+" Legend: [*] built-in  [ ] excluded  <M> module  < > module capable.\n"
+" <Esc> always leaves the current window\n"),
+radiolist_instructions[] = N_(
+" Use the arrow keys to navigate this window or\n"
+" press the hotkey of the item you wish to select\n"
+" followed by the <SPACE BAR>.\n"
+" Press <?>, <F1> or <h> for additional information about this option.\n"),
+inputbox_instructions_int[] = N_(
+"Please enter a decimal value.\n"
+"Fractions will not be accepted.\n"
+"Press <RETURN> to accept, <ESC> to cancel."),
+inputbox_instructions_hex[] = N_(
+"Please enter a hexadecimal value.\n"
+"Press <RETURN> to accept, <ESC> to cancel."),
+inputbox_instructions_string[] = N_(
+"Please enter a string value.\n"
+"Press <RETURN> to accept, <ESC> to cancel."),
+setmod_text[] = N_(
+"This feature depends on another which\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"),
+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"
+"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"
+"to modify that 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"),
+save_config_text[] = N_(
+"Enter a filename to which this configuration should be saved\n"
+"as an alternate.  Leave blank to abort."),
+save_config_help[] = N_(
+"\n"
+"For various reasons, one may wish to keep different kernel\n"
+"configurations 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"
+"configuration options you have selected at that time.\n"
+"\n"
+"If you are uncertain what all this means then you should probably\n"
+"leave this blank.\n"),
+search_help[] = N_(
+"\n"
+"Search for CONFIG_ symbols and display their relations.\n"
+"Regular expressions are allowed.\n"
+"Example: search for \"^FOO\"\n"
+"Result:\n"
+"-----------------------------------------------------------------\n"
+"Symbol: FOO [ = m]\n"
+"Prompt: Foo bus is used to drive the bar HW\n"
+"Defined at drivers/pci/Kconfig:47\n"
+"Depends on: X86_LOCAL_APIC && X86_IO_APIC || IA64\n"
+"Location:\n"
+"  -> Bus options (PCI, PCMCIA, EISA, MCA, ISA)\n"
+"    -> PCI support (PCI [ = y])\n"
+"      -> PCI access mode (<choice> [ = y])\n"
+"Selects: LIBCRC32\n"
+"Selected by: BAR\n"
+"-----------------------------------------------------------------\n"
+"o The line 'Prompt:' shows the text used in the menu structure for\n"
+"  this CONFIG_ 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"
+"  this symbol to be visible in the menu (selectable)\n"
+"o The 'Location:' lines tell where in the menu structure this symbol\n"
+"  is located\n"
+"    A location followed by a [ = y] indicate that this is a selectable\n"
+"    menu item - and current value is displayed inside brackets.\n"
+"o The 'Selects:' line tell what symbol will be automatically\n"
+"  selected if this symbol is selected (y or m)\n"
+"o The 'Selected by' line tell what symbol has selected this symbol\n"
+"\n"
+"Only relevant lines are shown.\n"
+"\n\n"
+"Search examples:\n"
+"Examples: USB   = > find all CONFIG_ symbols containing USB\n"
+"          ^USB => find all CONFIG_ symbols starting with USB\n"
+"          USB$ => find all CONFIG_ symbols ending with USB\n"
+"\n");
+struct mitem {
+        char str[256];
+        char tag;
+        void *usrptr;
+        int is_hot;
+        int is_visible;
+};
+#define MAX_MENU_ITEMS 4096
+static int show_all_items;
+static int indent;
+static struct menu *current_menu;
+static int child_count;
+static int single_menu_mode;
+/* the window in which all information appears */
+static WINDOW *main_window;
+/* the largest size of the menu window */
+static int mwin_max_lines;
+static int mwin_max_cols;
+/* the window in which we show option buttons */
+static MENU *curses_menu;
+static ITEM *curses_menu_items[MAX_MENU_ITEMS];
+static struct mitem k_menu_items[MAX_MENU_ITEMS];
+static int items_num;
+static int global_exit;
+/* the currently selected button */
+const char *current_instructions = menu_instructions;
+/* this array is used to implement hot keys. it is updated in item_make and
+ * resetted in clean_items. It would be better to use a hash, but lets keep it
+ * simple... */
+#define MAX_SAME_KEY MAX_MENU_ITEMS
+struct {
+        int count;
+        int ptrs[MAX_MENU_ITEMS];
+} hotkeys[1<<(sizeof(char)*8)];
+static void conf(struct menu *menu);
+static void conf_choice(struct menu *menu);
+static void conf_string(struct menu *menu);
+static void conf_load(void);
+static void conf_save(void);
+static void show_help(struct menu *menu);
+static int do_exit(void);
+static void setup_windows(void);
+typedef void (*function_key_handler_t)(int *key, struct menu *menu);
+static void handle_f1(int *key, struct menu *current_item);
+static void handle_f2(int *key, struct menu *current_item);
+static void handle_f3(int *key, struct menu *current_item);
+static void handle_f4(int *key, struct menu *current_item);
+static void handle_f5(int *key, struct menu *current_item);
+static void handle_f6(int *key, struct menu *current_item);
+static void handle_f7(int *key, struct menu *current_item);
+static void handle_f8(int *key, struct menu *current_item);
+struct function_keys {
+        const char *key_str;
+        const char *func;
+        function_key key;
+        function_key_handler_t handler;
+};
+static const int function_keys_num = 8;
+struct function_keys function_keys[] = {
+        {
+                .key_str = "F1",
+                .func = "Help",
+                .key = F_HELP,
+                .handler = handle_f1,
+        },
+        {
+                .key_str = "F2",
+                .func = "Symbol Info",
+                .key = F_SYMBOL,
+                .handler = handle_f2,
+        },
+        {
+                .key_str = "F3",
+                .func = "Instructions",
+                .key = F_INSTS,
+                .handler = handle_f3,
+        },
+        {
+                .key_str = "F4",
+                .func = "Config",
+                .key = F_CONF,
+                .handler = handle_f4,
+        },
+        {
+                .key_str = "F5",
+                .func = "Back",
+                .key = F_BACK,
+                .handler = handle_f5,
+        },
+        {
+                .key_str = "F6",
+                .func = "Save",
+                .key = F_SAVE,
+                .handler = handle_f6,
+        },
+        {
+                .key_str = "F7",
+                .func = "Load",
+                .key = F_LOAD,
+                .handler = handle_f7,
+        },
+        {
+                .key_str = "F8",
+                .func = "Exit",
+                .key = F_EXIT,
+                .handler = handle_f8,
+        },
+};
+static void print_function_line(void)
+{
+        int i;
+        int offset = 1;
+        const int skip = 1;
+        for (i = 0; i < function_keys_num; i++) {
+                wattrset(main_window, attributes[FUNCTION_HIGHLIGHT]);
+                mvwprintw(main_window, LINES-3, offset,
+                                "%s",
+                                function_keys[i].key_str);
+                wattrset(main_window, attributes[FUNCTION_TEXT]);
+                offset += strlen(function_keys[i].key_str);
+                mvwprintw(main_window, LINES-3,
+                                offset, "%s",
+                                function_keys[i].func);
+                offset += strlen(function_keys[i].func) + skip;
+        }
+        wattrset(main_window, attributes[NORMAL]);
+}
+/* help */
+static void handle_f1(int *key, struct menu *current_item)
+{
+        show_scroll_win(main_window,
+                        _("README"), _(nconf_readme));
+        return;
+}
+/* symbole help */
+static void handle_f2(int *key, struct menu *current_item)
+{
+        show_help(current_item);
+        return;
+}
+/* instructions */
+static void handle_f3(int *key, struct menu *current_item)
+{
+        show_scroll_win(main_window,
+                        _("Instructions"),
+                        _(current_instructions));
+        return;
+}
+/* config */
+static void handle_f4(int *key, struct menu *current_item)
+{
+        int res = btn_dialog(main_window,
+                        _("Show all symbols?"),
+                        2,
+                        "   <Show All>   ",
+                        "<Don't show all>");
+        if (res == 0)
+                show_all_items = 1;
+        else if (res == 1)
+                show_all_items = 0;
+        return;
+}
+/* back */
+static void handle_f5(int *key, struct menu *current_item)
+{
+        *key = KEY_LEFT;
+        return;
+}
+/* save */
+static void handle_f6(int *key, struct menu *current_item)
+{
+        conf_save();
+        return;
+}
+/* load */
+static void handle_f7(int *key, struct menu *current_item)
+{
+        conf_load();
+        return;
+}
+/* exit */
+static void handle_f8(int *key, struct menu *current_item)
+{
+        do_exit();
+        return;
+}
+/* return != 0 to indicate the key was handles */
+static int process_special_keys(int *key, struct menu *menu)
+{
+        int i;
+        if (*key == KEY_RESIZE) {
+                setup_windows();
+                return 1;
+        }
+        for (i = 0; i < function_keys_num; i++) {
+                if (*key == KEY_F(function_keys[i].key) ||
+                    *key == '0' + function_keys[i].key){
+                        function_keys[i].handler(key, menu);
+                        return 1;
+                }
+        }
+        return 0;
+}
+static void clean_items(void)
+{
+        int i;
+        for (i = 0; curses_menu_items[i]; i++)
+                free_item(curses_menu_items[i]);
+        bzero(curses_menu_items, sizeof(curses_menu_items));
+        bzero(k_menu_items, sizeof(k_menu_items));
+        bzero(hotkeys, sizeof(hotkeys));
+        items_num = 0;
+}
+/* return the index of the next hot item, or -1 if no such item exists */
+static int get_next_hot(int c)
+{
+        static int hot_index;
+        static int hot_char;
+        if (c < 0 || c > 255 || hotkeys[c].count <= 0)
+                return -1;
+        if (hot_char == c) {
+                hot_index = (hot_index+1)%hotkeys[c].count;
+                return hotkeys[c].ptrs[hot_index];
+        } else {
+                hot_char = c;
+                hot_index = 0;
+                return hotkeys[c].ptrs[0];
+        }
+}
+/* can the char c be a hot key? no, if c is a common shortcut used elsewhere */
+static int canbhot(char c)
+{
+        c = tolower(c);
+        return isalnum(c) && c != 'y' && c != 'm' && c != 'h' &&
+                c != 'n' && c != '?';
+}
+/* check if str already contains a hot key. */
+static int is_hot(int index)
+{
+        return k_menu_items[index].is_hot;
+}
+/* find the first possible hot key, and mark it.
+ * index is the index of the item in the menu
+ * return 0 on success*/
+static int make_hot(char *dest, int len, const char *org, int index)
+{
+        int position = -1;
+        int i;
+        int tmp;
+        int c;
+        int org_len = strlen(org);
+        if (org == NULL || is_hot(index))
+                return 1;
+        /* make sure not to make hot keys out of markers.
+         * find where to start looking for a hot key
+         */
+        i = 0;
+        /* skip white space */
+        while (i < org_len && org[i] == ' ')
+                i++;
+        if (i == org_len)
+                return -1;
+        /* if encountering '(' or '<' or '[', find the match and look from there
+         **/
+        if (org[i] == '[' || org[i] == '<' || org[i] == '(') {
+                i++;
+                for (; i < org_len; i++)
+                        if (org[i] == ']' || org[i] == '>' || org[i] == ')')
+                                break;
+        }
+        if (i == org_len)
+                return -1;
+        for (; i < org_len; i++) {
+                if (canbhot(org[i]) && org[i-1] != '<' && org[i-1] != '(') {
+                        position = i;
+                        break;
+                }
+        }
+        if (position == -1)
+                return 1;
+        /* ok, char at org[position] should be a hot key to this item */
+        c = tolower(org[position]);
+        tmp = hotkeys[c].count;
+        hotkeys[c].ptrs[tmp] = index;
+        hotkeys[c].count++;
+        /*
+           snprintf(dest, len, "%.*s(%c)%s", position, org, org[position],
+           &org[position+1]);
+           */
+        /* make org[position] uppercase, and all leading letter small case */
+        strncpy(dest, org, len);
+        for (i = 0; i < position; i++)
+                dest[i] = tolower(dest[i]);
+        dest[position] = toupper(dest[position]);
+        k_menu_items[index].is_hot = 1;
+        return 0;
+}
+/* Make a new item. Add a hotkey mark in the first possible letter.
+ * As ncurses does not allow any attributes inside menue item, we mark the
+ * hot key as the first capitalized letter in the string */
+static void item_make(struct menu *menu, char tag, const char *fmt, ...)
+{
+        va_list ap;
+        char tmp_str[256];
+        if (items_num > MAX_MENU_ITEMS-1)
+                return;
+        bzero(&k_menu_items[items_num], sizeof(k_menu_items[0]));
+        k_menu_items[items_num].tag = tag;
+        k_menu_items[items_num].usrptr = menu;
+        if (menu != NULL)
+                k_menu_items[items_num].is_visible =
+                        menu_is_visible(menu);
+        else
+                k_menu_items[items_num].is_visible = 1;
+        va_start(ap, fmt);
+        vsnprintf(tmp_str, sizeof(tmp_str), fmt, ap);
+        if (!k_menu_items[items_num].is_visible)
+                memcpy(tmp_str, "XXX", 3);
+        va_end(ap);
+        if (make_hot(
+                k_menu_items[items_num].str,
+                sizeof(k_menu_items[items_num].str), tmp_str, items_num) != 0)
+                strncpy(k_menu_items[items_num].str,
+                        tmp_str,
+                        sizeof(k_menu_items[items_num].str));
+        curses_menu_items[items_num] = new_item(
+                        k_menu_items[items_num].str,
+                        k_menu_items[items_num].str);
+        set_item_userptr(curses_menu_items[items_num],
+                        &k_menu_items[items_num]);
+        /*
+        if (!k_menu_items[items_num].is_visible)
+                item_opts_off(curses_menu_items[items_num], O_SELECTABLE);
+        */
+        items_num++;
+        curses_menu_items[items_num] = NULL;
+}
+/* very hackish. adds a string to the last item added */
+static void item_add_str(const char *fmt, ...)
+{
+        va_list ap;
+        int index = items_num-1;
+        char new_str[256];
+        char tmp_str[256];
+        if (index < 0)
+                return;
+        va_start(ap, fmt);
+        vsnprintf(new_str, sizeof(new_str), fmt, ap);
+        va_end(ap);
+        snprintf(tmp_str, sizeof(tmp_str), "%s%s",
+                        k_menu_items[index].str, new_str);
+        if (make_hot(k_menu_items[index].str,
+                        sizeof(k_menu_items[index].str), tmp_str, index) != 0)
+                strncpy(k_menu_items[index].str,
+                        tmp_str,
+                        sizeof(k_menu_items[index].str));
+        free_item(curses_menu_items[index]);
+        curses_menu_items[index] = new_item(
+                        k_menu_items[index].str,
+                        k_menu_items[index].str);
+        set_item_userptr(curses_menu_items[index],
+                        &k_menu_items[index]);
+}
+/* get the tag of the currently selected item */
+static char item_tag(void)
+{
+        ITEM *cur;
+        struct mitem *mcur;
+        cur = current_item(curses_menu);
+        if (cur == NULL)
+                return 0;
+        mcur = (struct mitem *) item_userptr(cur);
+        return mcur->tag;
+}
+static int curses_item_index(void)
+{
+        return  item_index(current_item(curses_menu));
+}
+static void *item_data(void)
+{
+        ITEM *cur;
+        struct mitem *mcur;
+        cur = current_item(curses_menu);
+        mcur = (struct mitem *) item_userptr(cur);
+        return mcur->usrptr;
+}
+static int item_is_tag(char tag)
+{
+        return item_tag() == tag;
+}
+static char filename[PATH_MAX+1];
+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"),
+                        config_filename, sym_get_string_value(sym));
+        if (size >= sizeof(menu_backtitle))
+                menu_backtitle[sizeof(menu_backtitle)-1] = '\0';
+        size = snprintf(filename, sizeof(filename), "%s", config_filename);
+        if (size >= sizeof(filename))
+                filename[sizeof(filename)-1] = '\0';
+        return menu_backtitle;
+}
+/* command = 0 is supress, 1 is restore */
+static void supress_stdout(int command)
+{
+        static FILE *org_stdout;
+        static FILE *org_stderr;
+        if (command == 0) {
+                org_stdout = stdout;
+                org_stderr = stderr;
+                stdout = fopen("/dev/null", "a");
+                stderr = fopen("/dev/null", "a");
+        } else {
+                fclose(stdout);
+                fclose(stderr);
+                stdout = org_stdout;
+                stderr = org_stderr;
+        }
+}
+/* return = 0 means we are successful.
+ * -1 means go on doing what you were doing
+ */
+static int do_exit(void)
+{
+        int res;
+        if (!conf_get_changed()) {
+                global_exit = 1;
+                return 0;
+        }
+        res = btn_dialog(main_window,
+                        _("Do you wish to save your "
+                                "new kernel configuration?\n"
+                                "<ESC> to cancel and resume nconfig."),
+                        2,
+                        "   <save>   ",
+                        "<don't save>");
+        if (res == KEY_EXIT) {
+                global_exit = 0;
+                return -1;
+        }
+        /* if we got here, the user really wants to exit */
+        switch (res) {
+        case 0:
+                supress_stdout(0);
+                res = conf_write(filename);
+                supress_stdout(1);
+                if (res)
+                        btn_dialog(
+                                main_window,
+                                _("Error during writing of the kernel "
+                                  "configuration.\n"
+                                  "Your kernel configuration "
+                                  "changes were NOT saved."),
+                                  1,
+                                  "<OK>");
+                else {
+                        char buf[1024];
+                        snprintf(buf, 1024,
+                                _("Configuration written to %s\n"
+                                  "End of Linux kernel configuration.\n"
+                                  "Execute 'make' to build the kernel or try"
+                                  " 'make help'."), filename);
+                        btn_dialog(
+                                main_window,
+                                buf,
+                                1,
+                                "<OK>");
+                }
+                break;
+        default:
+                btn_dialog(
+                        main_window,
+                        _("Your kernel configuration changes were NOT saved."),
+                        1,
+                        "<OK>");
+                break;
+        }
+        global_exit = 1;
+        return 0;
+}
+static void search_conf(void)
+{
+        struct symbol **sym_arr;
+        struct gstr res;
+        char dialog_input_result[100];
+        char *dialog_input;
+        int dres;
+again:
+        dres = dialog_inputbox(main_window,
+                        _("Search Configuration Parameter"),
+                        _("Enter CONFIG_ (sub)string to search for "
+                                "(with or without \"CONFIG\")"),
+                        "", dialog_input_result, 99);
+        switch (dres) {
+        case 0:
+                break;
+        case 1:
+                show_scroll_win(main_window,
+                                _("Search Configuration"), search_help);
+                goto again;
+        default:
+                return;
+        }
+        /* strip CONFIG_ if necessary */
+        dialog_input = dialog_input_result;
+        if (strncasecmp(dialog_input_result, "CONFIG_", 7) == 0)
+                dialog_input += 7;
+        sym_arr = sym_re_search(dialog_input);
+        res = get_relations_str(sym_arr);
+        free(sym_arr);
+        show_scroll_win(main_window,
+                        _("Search Results"), str_get(&res));
+        str_free(&res);
+}
+static void build_conf(struct menu *menu)
+{
+        struct symbol *sym;
+        struct property *prop;
+        struct menu *child;
+        int type, tmp, doint = 2;
+        tristate val;
+        char ch;
+        if (!menu || (!show_all_items && !menu_is_visible(menu)))
+                return;
+        sym = menu->sym;
+        prop = menu->prompt;
+        if (!sym) {
+                if (prop && menu != current_menu) {
+                        const char *prompt = menu_get_prompt(menu);
+                        enum prop_type ptype;
+                        ptype = menu->prompt ? menu->prompt->type : P_UNKNOWN;
+                        switch (ptype) {
+                        case P_MENU:
+                                child_count++;
+                                prompt = _(prompt);
+                                if (single_menu_mode) {
+                                        item_make(menu, 'm',
+                                                "%s%*c%s",
+                                                menu->data ? "-->" : "++>",
+                                                indent + 1, ' ', prompt);
+                                } else
+                                        item_make(menu, 'm',
+                                                "   %*c%s  --->",
+                                                indent + 1,
+                                                ' ', prompt);
+                                if (single_menu_mode && menu->data)
+                                        goto conf_childs;
+                                return;
+                        case P_COMMENT:
+                                if (prompt) {
+                                        child_count++;
+                                        item_make(menu, ':',
+                                                "   %*c*** %s ***",
+                                                indent + 1, ' ',
+                                                _(prompt));
+                                }
+                                break;
+                        default:
+                                if (prompt) {
+                                        child_count++;
+                                        item_make(menu, ':', "---%*c%s",
+                                                indent + 1, ' ',
+                                                _(prompt));
+                                }
+                        }
+                } else
+                        doint = 0;
+                goto conf_childs;
+        }
+        type = sym_get_type(sym);
+        if (sym_is_choice(sym)) {
+                struct symbol *def_sym = sym_get_choice_value(sym);
+                struct menu *def_menu = NULL;
+                child_count++;
+                for (child = menu->list; child; child = child->next) {
+                        if (menu_is_visible(child) && child->sym == def_sym)
+                                def_menu = child;
+                }
+                val = sym_get_tristate_value(sym);
+                if (sym_is_changable(sym)) {
+                        switch (type) {
+                        case S_BOOLEAN:
+                                item_make(menu, 't', "[%c]",
+                                                val == no ? ' ' : '*');
+                                break;
+                        case S_TRISTATE:
+                                switch (val) {
+                                case yes:
+                                        ch = '*';
+                                        break;
+                                case mod:
+                                        ch = 'M';
+                                        break;
+                                default:
+                                        ch = ' ';
+                                        break;
+                                }
+                                item_make(menu, 't', "<%c>", ch);
+                                break;
+                        }
+                } else {
+                        item_make(menu, def_menu ? 't' : ':', "   ");
+                }
+                item_add_str("%*c%s", indent + 1,
+                                ' ', _(menu_get_prompt(menu)));
+                if (val == yes) {
+                        if (def_menu) {
+                                item_add_str(" (%s)",
+                                        _(menu_get_prompt(def_menu)));
+                                item_add_str("  --->");
+                                if (def_menu->list) {
+                                        indent += 2;
+                                        build_conf(def_menu);
+                                        indent -= 2;
+                                }
+                        }
+                        return;
+                }
+        } else {
+                if (menu == current_menu) {
+                        item_make(menu, ':',
+                                "---%*c%s", indent + 1,
+                                ' ', _(menu_get_prompt(menu)));
+                        goto conf_childs;
+                }
+                child_count++;
+                val = sym_get_tristate_value(sym);
+                if (sym_is_choice_value(sym) && val == yes) {
+                        item_make(menu, ':', "   ");
+                } else {
+                        switch (type) {
+                        case S_BOOLEAN:
+                                if (sym_is_changable(sym))
+                                        item_make(menu, 't', "[%c]",
+                                                val == no ? ' ' : '*');
+                                else
+                                        item_make(menu, 't', "-%c-",
+                                                val == no ? ' ' : '*');
+                                break;
+                        case S_TRISTATE:
+                                switch (val) {
+                                case yes:
+                                        ch = '*';
+                                        break;
+                                case mod:
+                                        ch = 'M';
+                                        break;
+                                default:
+                                        ch = ' ';
+                                        break;
+                                }
+                                if (sym_is_changable(sym)) {
+                                        if (sym->rev_dep.tri == mod)
+                                                item_make(menu,
+                                                        't', "{%c}", ch);
+                                        else
+                                                item_make(menu,
+                                                        't', "<%c>", ch);
+                                } else
+                                        item_make(menu, 't', "-%c-", ch);
+                                break;
+                        default:
+                                tmp = 2 + strlen(sym_get_string_value(sym));
+                                item_make(menu, 's', "    (%s)",
+                                                sym_get_string_value(sym));
+                                tmp = indent - tmp + 4;
+                                if (tmp < 0)
+                                        tmp = 0;
+                                item_add_str("%*c%s%s", tmp, ' ',
+                                                _(menu_get_prompt(menu)),
+                                                (sym_has_value(sym) ||
+                                                 !sym_is_changable(sym)) ? "" :
+                                                _(" (NEW)"));
+                                goto conf_childs;
+                        }
+                }
+                item_add_str("%*c%s%s", indent + 1, ' ',
+                                _(menu_get_prompt(menu)),
+                                (sym_has_value(sym) || !sym_is_changable(sym)) ?
+                                "" : _(" (NEW)"));
+                if (menu->prompt && menu->prompt->type == P_MENU) {
+                        item_add_str("  --->");
+                        return;
+                }
+        }
+conf_childs:
+        indent += doint;
+        for (child = menu->list; child; child = child->next)
+                build_conf(child);
+        indent -= doint;
+}
+static void reset_menu(void)
+{
+        unpost_menu(curses_menu);
+        clean_items();
+}
+/* adjust the menu to show this item.
+ * prefer not to scroll the menu if possible*/
+static void center_item(int selected_index, int *last_top_row)
+{
+        int toprow;
+        int maxy, maxx;
+        scale_menu(curses_menu, &maxy, &maxx);
+        set_top_row(curses_menu, *last_top_row);
+        toprow = top_row(curses_menu);
+        if (selected_index >= toprow && selected_index < toprow+maxy) {
+                /* we can only move the selected item. no need to scroll */
+                set_current_item(curses_menu,
+                                curses_menu_items[selected_index]);
+        } else {
+                toprow = max(selected_index-maxy/2, 0);
+                if (toprow >= item_count(curses_menu)-maxy)
+                        toprow = item_count(curses_menu)-mwin_max_lines;
+                set_top_row(curses_menu, toprow);
+                set_current_item(curses_menu,
+                                curses_menu_items[selected_index]);
+        }
+        *last_top_row = toprow;
+        post_menu(curses_menu);
+        refresh_all_windows(main_window);
+}
+/* this function assumes reset_menu has been called before */
+static void show_menu(const char *prompt, const char *instructions,
+                int selected_index, int *last_top_row)
+{
+        int maxx, maxy;
+        WINDOW *menu_window;
+        current_instructions = instructions;
+        clear();
+        wattrset(main_window, attributes[NORMAL]);
+        print_in_middle(stdscr, 1, 0, COLS,
+                        menu_backtitle,
+                        attributes[MAIN_HEADING]);
+        wattrset(main_window, attributes[MAIN_MENU_BOX]);
+        box(main_window, 0, 0);
+        wattrset(main_window, attributes[MAIN_MENU_HEADING]);
+        mvwprintw(main_window, 0, 3, " %s ", prompt);
+        wattrset(main_window, attributes[NORMAL]);
+        set_menu_items(curses_menu, curses_menu_items);
+        /* position the menu at the middle of the screen */
+        scale_menu(curses_menu, &maxy, &maxx);
+        maxx = min(maxx, mwin_max_cols-2);
+        maxy = mwin_max_lines-2;
+        menu_window = derwin(main_window,
+                        maxy,
+                        maxx,
+                        2,
+                        (mwin_max_cols-maxx)/2);
+        keypad(menu_window, TRUE);
+        set_menu_win(curses_menu, menu_window);
+        set_menu_sub(curses_menu, menu_window);
+        /* must reassert this after changing items, otherwise returns to a
+         * default of 16
+         */
+        set_menu_format(curses_menu, maxy, 1);
+        center_item(selected_index, last_top_row);
+        set_menu_format(curses_menu, maxy, 1);
+        print_function_line();
+        /* Post the menu */
+        post_menu(curses_menu);
+        refresh_all_windows(main_window);
+}
+static void conf(struct menu *menu)
+{
+        char pattern[256];
+        struct menu *submenu = 0;
+        const char *prompt = menu_get_prompt(menu);
+        struct symbol *sym;
+        struct menu *active_menu = NULL;
+        int res;
+        int current_index = 0;
+        int last_top_row = 0;
+        bzero(pattern, sizeof(pattern));
+        while (!global_exit) {
+                reset_menu();
+                current_menu = menu;
+                build_conf(menu);
+                if (!child_count)
+                        break;
+                show_menu(prompt ? _(prompt) : _("Main Menu"),
+                                _(menu_instructions),
+                                current_index, &last_top_row);
+                keypad((menu_win(curses_menu)), TRUE);
+                while (!global_exit && (res = wgetch(menu_win(curses_menu)))) {
+                        if (process_special_keys(&res,
+                                                (struct menu *) item_data()))
+                                break;
+                        switch (res) {
+                        case KEY_DOWN:
+                                menu_driver(curses_menu, REQ_DOWN_ITEM);
+                                break;
+                        case KEY_UP:
+                                menu_driver(curses_menu, REQ_UP_ITEM);
+                                break;
+                        case KEY_NPAGE:
+                                menu_driver(curses_menu, REQ_SCR_DPAGE);
+                                break;
+                        case KEY_PPAGE:
+                                menu_driver(curses_menu, REQ_SCR_UPAGE);
+                                break;
+                        case KEY_HOME:
+                                menu_driver(curses_menu, REQ_FIRST_ITEM);
+                                break;
+                        case KEY_END:
+                                menu_driver(curses_menu, REQ_LAST_ITEM);
+                                break;
+                        case 'h':
+                        case '?':
+                                show_help((struct menu *) item_data());
+                                break;
+                        }
+                        if (res == 10 || res == 27 ||
+                                res == 32 || res == 'n' || res == 'y' ||
+                                res == KEY_LEFT || res == KEY_RIGHT ||
+                                res == 'm' || res == '/')
+                                break;
+                        else if (canbhot(res)) {
+                                /* check for hot keys: */
+                                int tmp = get_next_hot(res);
+                                if (tmp != -1)
+                                        center_item(tmp, &last_top_row);
+                        }
+                        refresh_all_windows(main_window);
+                }
+                refresh_all_windows(main_window);
+                /* if ESC  or left*/
+                if (res == 27 || (menu != &rootmenu && res == KEY_LEFT))
+                        break;
+                /* remember location in the menu */
+                last_top_row = top_row(curses_menu);
+                current_index = curses_item_index();
+                if (!item_tag())
+                        continue;
+                submenu = (struct menu *) item_data();
+                active_menu = (struct menu *)item_data();
+                if (!submenu || !menu_is_visible(submenu))
+                        continue;
+                if (submenu)
+                        sym = submenu->sym;
+                else
+                        sym = NULL;
+                switch (res) {
+                case ' ':
+                        if (item_is_tag('t'))
+                                sym_toggle_tristate_value(sym);
+                        else if (item_is_tag('m'))
+                                conf(submenu);
+                        break;
+                case KEY_RIGHT:
+                case 10: /* ENTER WAS PRESSED */
+                        switch (item_tag()) {
+                        case 'm':
+                                if (single_menu_mode)
+                                        submenu->data =
+                                                (void *) (long) !submenu->data;
+                                else
+                                        conf(submenu);
+                                break;
+                        case 't':
+                                if (sym_is_choice(sym) &&
+                                    sym_get_tristate_value(sym) == yes)
+                                        conf_choice(submenu);
+                                else if (submenu->prompt &&
+                                         submenu->prompt->type == P_MENU)
+                                        conf(submenu);
+                                else if (res == 10)
+                                        sym_toggle_tristate_value(sym);
+                                break;
+                        case 's':
+                                conf_string(submenu);
+                                break;
+                        }
+                        break;
+                case 'y':
+                        if (item_is_tag('t')) {
+                                if (sym_set_tristate_value(sym, yes))
+                                        break;
+                                if (sym_set_tristate_value(sym, mod))
+                                        btn_dialog(main_window, setmod_text, 0);
+                        }
+                        break;
+                case 'n':
+                        if (item_is_tag('t'))
+                                sym_set_tristate_value(sym, no);
+                        break;
+                case 'm':
+                        if (item_is_tag('t'))
+                                sym_set_tristate_value(sym, mod);
+                        break;
+                case '/':
+                        search_conf();
+                        break;
+                }
+        }
+}
+static void show_help(struct menu *menu)
+{
+        struct gstr help = str_new();
+        if (menu && menu->sym && menu_has_help(menu)) {
+                if (menu->sym->name) {
+                        str_printf(&help, "CONFIG_%s:\n\n", menu->sym->name);
+                        str_append(&help, _(menu_get_help(menu)));
+                        str_append(&help, "\n");
+                        get_symbol_str(&help, menu->sym);
+                }
+        } else {
+                str_append(&help, nohelp_text);
+        }
+        show_scroll_win(main_window, _(menu_get_prompt(menu)), str_get(&help));
+        str_free(&help);
+}
+static void conf_choice(struct menu *menu)
+{
+        const char *prompt = _(menu_get_prompt(menu));
+        struct menu *child = 0;
+        struct symbol *active;
+        int selected_index = 0;
+        int last_top_row = 0;
+        int res, i = 0;
+        active = sym_get_choice_value(menu->sym);
+        /* this is mostly duplicated from the conf() function. */
+        while (!global_exit) {
+                reset_menu();
+                for (i = 0, child = menu->list; child; child = child->next) {
+                        if (!show_all_items && !menu_is_visible(child))
+                                continue;
+                        if (child->sym == sym_get_choice_value(menu->sym))
+                                item_make(child, ':', "<X> %s",
+                                                _(menu_get_prompt(child)));
+                        else
+                                item_make(child, ':', "    %s",
+                                                _(menu_get_prompt(child)));
+                        if (child->sym == active){
+                                last_top_row = top_row(curses_menu);
+                                selected_index = i;
+                        }
+                        i++;
+                }
+                show_menu(prompt ? _(prompt) : _("Choice Menu"),
+                                _(radiolist_instructions),
+                                selected_index,
+                                &last_top_row);
+                while (!global_exit && (res = wgetch(menu_win(curses_menu)))) {
+                        if (process_special_keys(
+                                                &res,
+                                                (struct menu *) item_data()))
+                                break;
+                        switch (res) {
+                        case KEY_DOWN:
+                                menu_driver(curses_menu, REQ_DOWN_ITEM);
+                                break;
+                        case KEY_UP:
+                                menu_driver(curses_menu, REQ_UP_ITEM);
+                                break;
+                        case KEY_NPAGE:
+                                menu_driver(curses_menu, REQ_SCR_DPAGE);
+                                break;
+                        case KEY_PPAGE:
+                                menu_driver(curses_menu, REQ_SCR_UPAGE);
+                                break;
+                        case KEY_HOME:
+                                menu_driver(curses_menu, REQ_FIRST_ITEM);
+                                break;
+                        case KEY_END:
+                                menu_driver(curses_menu, REQ_LAST_ITEM);
+                                break;
+                        case 'h':
+                        case '?':
+                                show_help((struct menu *) item_data());
+                                break;
+                        }
+                        if (res == 10 || res == 27 || res == ' ' ||
+                                res == KEY_LEFT)
+                                break;
+                        else if (canbhot(res)) {
+                                /* check for hot keys: */
+                                int tmp = get_next_hot(res);
+                                if (tmp != -1)
+                                        center_item(tmp, &last_top_row);
+                        }
+                        refresh_all_windows(main_window);
+                }
+                /* if ESC or left */
+                if (res == 27 || res == KEY_LEFT)
+                        break;
+                child = item_data();
+                if (!child || !menu_is_visible(child))
+                        continue;
+                switch (res) {
+                case ' ':
+                case  10:
+                case KEY_RIGHT:
+                        sym_set_tristate_value(child->sym, yes);
+                        return;
+                case 'h':
+                case '?':
+                        show_help(child);
+                        active = child->sym;
+                        break;
+                case KEY_EXIT:
+                        return;
+                }
+        }
+}
+static void conf_string(struct menu *menu)
+{
+        const char *prompt = menu_get_prompt(menu);
+        char dialog_input_result[256];
+        while (1) {
+                int res;
+                const char *heading;
+                switch (sym_get_type(menu->sym)) {
+                case S_INT:
+                        heading = _(inputbox_instructions_int);
+                        break;
+                case S_HEX:
+                        heading = _(inputbox_instructions_hex);
+                        break;
+                case S_STRING:
+                        heading = _(inputbox_instructions_string);
+                        break;
+                default:
+                        heading = _("Internal nconf error!");
+                }
+                res = dialog_inputbox(main_window,
+                                prompt ? _(prompt) : _("Main Menu"),
+                                heading,
+                                sym_get_string_value(menu->sym),
+                                dialog_input_result,
+                                sizeof(dialog_input_result));
+                switch (res) {
+                case 0:
+                        if (sym_set_string_value(menu->sym,
+                                                dialog_input_result))
+                                return;
+                        btn_dialog(main_window,
+                                _("You have made an invalid entry."), 0);
+                        break;
+                case 1:
+                        show_help(menu);
+                        break;
+                case KEY_EXIT:
+                        return;
+                }
+        }
+}
+static void conf_load(void)
+{
+        char dialog_input_result[256];
+        while (1) {
+                int res;
+                res = dialog_inputbox(main_window,
+                                NULL, load_config_text,
+                                filename,
+                                dialog_input_result,
+                                sizeof(dialog_input_result));
+                switch (res) {
+                case 0:
+                        if (!dialog_input_result[0])
+                                return;
+                        if (!conf_read(dialog_input_result)) {
+                                set_config_filename(dialog_input_result);
+                                sym_set_change_count(1);
+                                return;
+                        }
+                        btn_dialog(main_window, _("File does not exist!"), 0);
+                        break;
+                case 1:
+                        show_scroll_win(main_window,
+                                        _("Load Alternate Configuration"),
+                                        load_config_help);
+                        break;
+                case KEY_EXIT:
+                        return;
+                }
+        }
+}
+static void conf_save(void)
+{
+        char dialog_input_result[256];
+        while (1) {
+                int res;
+                res = dialog_inputbox(main_window,
+                                NULL, save_config_text,
+                                filename,
+                                dialog_input_result,
+                                sizeof(dialog_input_result));
+                switch (res) {
+                case 0:
+                        if (!dialog_input_result[0])
+                                return;
+                        supress_stdout(0);
+                        res = conf_write(dialog_input_result);
+                        supress_stdout(1);
+                        if (!res) {
+                                char buf[1024];
+                                sprintf(buf, "%s %s",
+                                        _("configuration file saved to: "),
+                                        dialog_input_result);
+                                btn_dialog(main_window,
+                                           buf, 1, "<OK>");
+                                set_config_filename(dialog_input_result);
+                                return;
+                        }
+                        btn_dialog(main_window, _("Can't create file! "
+                                "Probably a nonexistent directory."),
+                                1, "<OK>");
+                        break;
+                case 1:
+                        show_scroll_win(main_window,
+                                _("Save Alternate Configuration"),
+                                save_config_help);
+                        break;
+                case KEY_EXIT:
+                        return;
+                }
+        }
+}
+void setup_windows(void)
+{
+        if (main_window != NULL)
+                delwin(main_window);
+        /* set up the menu and menu window */
+        main_window = newwin(LINES-2, COLS-2, 2, 1);
+        keypad(main_window, TRUE);
+        mwin_max_lines = LINES-6;
+        mwin_max_cols = COLS-6;
+        /* panels order is from bottom to top */
+        new_panel(main_window);
+}
+int main(int ac, char **av)
+{
+        char *mode;
+        setlocale(LC_ALL, "");
+        bindtextdomain(PACKAGE, LOCALEDIR);
+        textdomain(PACKAGE);
+        conf_parse(av[1]);
+        conf_read(NULL);
+        mode = getenv("NCONFIG_MODE");
+        if (mode) {
+                if (!strcasecmp(mode, "single_menu"))
+                        single_menu_mode = 1;
+        }
+        /* Initialize curses */
+        initscr();
+        /* set color theme */
+        set_colors();
+        cbreak();
+        noecho();
+        keypad(stdscr, TRUE);
+        curs_set(0);
+        if (COLS < 75 || LINES < 20) {
+                endwin();
+                printf("Your terminal should have at "
+                        "least 20 lines and 75 columns\n");
+                return 1;
+        }
+        notimeout(stdscr, FALSE);
+        ESCDELAY = 1;
+        /* set btns menu */
+        curses_menu = new_menu(curses_menu_items);
+        menu_opts_off(curses_menu, O_SHOWDESC);
+        menu_opts_off(curses_menu, O_SHOWMATCH);
+        menu_opts_on(curses_menu, O_ONEVALUE);
+        menu_opts_on(curses_menu, O_NONCYCLIC);
+        set_menu_mark(curses_menu, " ");
+        set_menu_fore(curses_menu, attributes[MAIN_MENU_FORE]);
+        set_menu_back(curses_menu, attributes[MAIN_MENU_BACK]);
+        set_menu_grey(curses_menu, attributes[MAIN_MENU_GREY]);
+        set_config_filename(conf_get_configname());
+        setup_windows();
+        /* check for KEY_FUNC(1) */
+        if (has_key(KEY_F(1)) == FALSE) {
+                show_scroll_win(main_window,
+                                _("Instructions"),
+                                _(menu_no_f_instructions));
+        }
+        /* do the work */
+        while (!global_exit) {
+                conf(&rootmenu);
+                if (!global_exit && do_exit() == 0)
+                        break;
+        }
+        /* ok, we are done */
+        unpost_menu(curses_menu);
+        free_menu(curses_menu);
+        delwin(main_window);
+        clear();
+        refresh();
+        endwin();
+        return 0;
+}
diff --git a/scripts/kconfig/nconf.gui.c b/scripts/kconfig/nconf.gui.c
new file mode 100644
index 000000000000..a9d9344e1365
--- /dev/null
+++ b/scripts/kconfig/nconf.gui.c
@@ -0,0 +1,617 @@
+/*
+ * Copyright (C) 2008 Nir Tzachar <nir.tzachar@gmail.com?
+ * Released under the terms of the GNU GPL v2.0.
+ *
+ * Derived from menuconfig.
+ *
+ */
+#include "nconf.h"
+/* a list of all the different widgets we use */
+attributes_t attributes[ATTR_MAX+1] = {0};
+/* available colors:
+   COLOR_BLACK   0
+   COLOR_RED     1
+   COLOR_GREEN   2
+   COLOR_YELLOW  3
+   COLOR_BLUE    4
+   COLOR_MAGENTA 5
+   COLOR_CYAN    6
+   COLOR_WHITE   7
+   */
+static void set_normal_colors(void)
+{
+        init_pair(NORMAL, -1, -1);
+        init_pair(MAIN_HEADING, COLOR_MAGENTA, -1);
+        /* FORE is for the selected item */
+        init_pair(MAIN_MENU_FORE, -1, -1);
+        /* BACK for all the rest */
+        init_pair(MAIN_MENU_BACK, -1, -1);
+        init_pair(MAIN_MENU_GREY, -1, -1);
+        init_pair(MAIN_MENU_HEADING, COLOR_GREEN, -1);
+        init_pair(MAIN_MENU_BOX, COLOR_YELLOW, -1);
+        init_pair(SCROLLWIN_TEXT, -1, -1);
+        init_pair(SCROLLWIN_HEADING, COLOR_GREEN, -1);
+        init_pair(SCROLLWIN_BOX, COLOR_YELLOW, -1);
+        init_pair(DIALOG_TEXT, -1, -1);
+        init_pair(DIALOG_BOX, COLOR_YELLOW, -1);
+        init_pair(DIALOG_MENU_BACK, COLOR_YELLOW, -1);
+        init_pair(DIALOG_MENU_FORE, COLOR_RED, -1);
+        init_pair(INPUT_BOX, COLOR_YELLOW, -1);
+        init_pair(INPUT_HEADING, COLOR_GREEN, -1);
+        init_pair(INPUT_TEXT, -1, -1);
+        init_pair(INPUT_FIELD, -1, -1);
+        init_pair(FUNCTION_HIGHLIGHT, -1, -1);
+        init_pair(FUNCTION_TEXT, COLOR_BLUE, -1);
+}
+/* available attributes:
+   A_NORMAL        Normal display (no highlight)
+   A_STANDOUT      Best highlighting mode of the terminal.
+   A_UNDERLINE     Underlining
+   A_REVERSE       Reverse video
+   A_BLINK         Blinking
+   A_DIM           Half bright
+   A_BOLD          Extra bright or bold
+   A_PROTECT       Protected mode
+   A_INVIS         Invisible or blank mode
+   A_ALTCHARSET    Alternate character set
+   A_CHARTEXT      Bit-mask to extract a character
+   COLOR_PAIR(n)   Color-pair number n
+   */
+static void normal_color_theme(void)
+{
+        /* automatically add color... */
+#define mkattr(name, attr) do { \
+attributes[name] = attr | COLOR_PAIR(name); } while (0)
+        mkattr(NORMAL, NORMAL);
+        mkattr(MAIN_HEADING, A_BOLD | A_UNDERLINE);
+        mkattr(MAIN_MENU_FORE, A_REVERSE);
+        mkattr(MAIN_MENU_BACK, A_NORMAL);
+        mkattr(MAIN_MENU_GREY, A_NORMAL);
+        mkattr(MAIN_MENU_HEADING, A_BOLD);
+        mkattr(MAIN_MENU_BOX, A_NORMAL);
+        mkattr(SCROLLWIN_TEXT, A_NORMAL);
+        mkattr(SCROLLWIN_HEADING, A_BOLD);
+        mkattr(SCROLLWIN_BOX, A_BOLD);
+        mkattr(DIALOG_TEXT, A_BOLD);
+        mkattr(DIALOG_BOX, A_BOLD);
+        mkattr(DIALOG_MENU_FORE, A_STANDOUT);
+        mkattr(DIALOG_MENU_BACK, A_NORMAL);
+        mkattr(INPUT_BOX, A_NORMAL);
+        mkattr(INPUT_HEADING, A_BOLD);
+        mkattr(INPUT_TEXT, A_NORMAL);
+        mkattr(INPUT_FIELD, A_UNDERLINE);
+        mkattr(FUNCTION_HIGHLIGHT, A_BOLD);
+        mkattr(FUNCTION_TEXT, A_REVERSE);
+}
+static void no_colors_theme(void)
+{
+        /* automatically add highlight, no color */
+#define mkattrn(name, attr) { attributes[name] = attr; }
+        mkattrn(NORMAL, NORMAL);
+        mkattrn(MAIN_HEADING, A_BOLD | A_UNDERLINE);
+        mkattrn(MAIN_MENU_FORE, A_STANDOUT);
+        mkattrn(MAIN_MENU_BACK, A_NORMAL);
+        mkattrn(MAIN_MENU_GREY, A_NORMAL);
+        mkattrn(MAIN_MENU_HEADING, A_BOLD);
+        mkattrn(MAIN_MENU_BOX, A_NORMAL);
+        mkattrn(SCROLLWIN_TEXT, A_NORMAL);
+        mkattrn(SCROLLWIN_HEADING, A_BOLD);
+        mkattrn(SCROLLWIN_BOX, A_BOLD);
+        mkattrn(DIALOG_TEXT, A_NORMAL);
+        mkattrn(DIALOG_BOX, A_BOLD);
+        mkattrn(DIALOG_MENU_FORE, A_STANDOUT);
+        mkattrn(DIALOG_MENU_BACK, A_NORMAL);
+        mkattrn(INPUT_BOX, A_BOLD);
+        mkattrn(INPUT_HEADING, A_BOLD);
+        mkattrn(INPUT_TEXT, A_NORMAL);
+        mkattrn(INPUT_FIELD, A_UNDERLINE);
+        mkattrn(FUNCTION_HIGHLIGHT, A_BOLD);
+        mkattrn(FUNCTION_TEXT, A_REVERSE);
+}
+void set_colors()
+{
+        start_color();
+        use_default_colors();
+        set_normal_colors();
+        if (has_colors()) {
+                normal_color_theme();
+        } else {
+                /* give deafults */
+                no_colors_theme();
+        }
+}
+/* this changes the windows attributes !!! */
+void print_in_middle(WINDOW *win,
+                int starty,
+                int startx,
+                int width,
+                const char *string,
+                chtype color)
+{      int length, x, y;
+        float temp;
+        if (win == NULL)
+                win = stdscr;
+        getyx(win, y, x);
+        if (startx != 0)
+                x = startx;
+        if (starty != 0)
+                y = starty;
+        if (width == 0)
+                width = 80;
+        length = strlen(string);
+        temp = (width - length) / 2;
+        x = startx + (int)temp;
+        wattrset(win, color);
+        mvwprintw(win, y, x, "%s", string);
+        refresh();
+}
+int get_line_no(const char *text)
+{
+        int i;
+        int total = 1;
+        if (!text)
+                return 0;
+        for (i = 0; text[i] != '\0'; i++)
+                if (text[i] == '\n')
+                        total++;
+        return total;
+}
+const char *get_line(const char *text, int line_no)
+{
+        int i;
+        int lines = 0;
+        if (!text)
+                return 0;
+        for (i = 0; text[i] != '\0' && lines < line_no; i++)
+                if (text[i] == '\n')
+                        lines++;
+        return text+i;
+}
+int get_line_length(const char *line)
+{
+        int res = 0;
+        while (*line != '\0' && *line != '\n') {
+                line++;
+                res++;
+        }
+        return res;
+}
+/* print all lines to the window. */
+void fill_window(WINDOW *win, const char *text)
+{
+        int x, y;
+        int total_lines = get_line_no(text);
+        int i;
+        getmaxyx(win, y, x);
+        /* do not go over end of line */
+        total_lines = min(total_lines, y);
+        for (i = 0; i < total_lines; i++) {
+                char tmp[x+10];
+                const char *line = get_line(text, i);
+                int len = get_line_length(line);
+                strncpy(tmp, line, min(len, x));
+                tmp[len] = '\0';
+                mvwprintw(win, i, 0, "%s", tmp);
+        }
+}
+/* get the message, and buttons.
+ * each button must be a char*
+ * return the selected button
+ *
+ * this dialog is used for 2 different things:
+ * 1) show a text box, no buttons.
+ * 2) show a dialog, with horizontal buttons
+ */
+int btn_dialog(WINDOW *main_window, const char *msg, int btn_num, ...)
+{
+        va_list ap;
+        char *btn;
+        int btns_width = 0;
+        int msg_lines = 0;
+        int msg_width = 0;
+        int total_width;
+        int win_rows = 0;
+        WINDOW *win;
+        WINDOW *msg_win;
+        WINDOW *menu_win;
+        MENU *menu;
+        ITEM *btns[btn_num+1];
+        int i, x, y;
+        int res = -1;
+        va_start(ap, btn_num);
+        for (i = 0; i < btn_num; i++) {
+                btn = va_arg(ap, char *);
+                btns[i] = new_item(btn, "");
+                btns_width += strlen(btn)+1;
+        }
+        va_end(ap);
+        btns[btn_num] = NULL;
+        /* find the widest line of msg: */
+        msg_lines = get_line_no(msg);
+        for (i = 0; i < msg_lines; i++) {
+                const char *line = get_line(msg, i);
+                int len = get_line_length(line);
+                if (msg_width < len)
+                        msg_width = len;
+        }
+        total_width = max(msg_width, btns_width);
+        /* place dialog in middle of screen */
+        y = (LINES-(msg_lines+4))/2;
+        x = (COLS-(total_width+4))/2;
+        /* create the windows */
+        if (btn_num > 0)
+                win_rows = msg_lines+4;
+        else
+                win_rows = msg_lines+2;
+        win = newwin(win_rows, total_width+4, y, x);
+        keypad(win, TRUE);
+        menu_win = derwin(win, 1, btns_width, win_rows-2,
+                        1+(total_width+2-btns_width)/2);
+        menu = new_menu(btns);
+        msg_win = derwin(win, win_rows-2, msg_width, 1,
+                        1+(total_width+2-msg_width)/2);
+        set_menu_fore(menu, attributes[DIALOG_MENU_FORE]);
+        set_menu_back(menu, attributes[DIALOG_MENU_BACK]);
+        wattrset(win, attributes[DIALOG_BOX]);
+        box(win, 0, 0);
+        /* print message */
+        wattrset(msg_win, attributes[DIALOG_TEXT]);
+        fill_window(msg_win, msg);
+        set_menu_win(menu, win);
+        set_menu_sub(menu, menu_win);
+        set_menu_format(menu, 1, btn_num);
+        menu_opts_off(menu, O_SHOWDESC);
+        menu_opts_off(menu, O_SHOWMATCH);
+        menu_opts_on(menu, O_ONEVALUE);
+        menu_opts_on(menu, O_NONCYCLIC);
+        set_menu_mark(menu, "");
+        post_menu(menu);
+        touchwin(win);
+        refresh_all_windows(main_window);
+        while ((res = wgetch(win))) {
+                switch (res) {
+                case KEY_LEFT:
+                        menu_driver(menu, REQ_LEFT_ITEM);
+                        break;
+                case KEY_RIGHT:
+                        menu_driver(menu, REQ_RIGHT_ITEM);
+                        break;
+                case 10: /* ENTER */
+                case 27: /* ESCAPE */
+                case ' ':
+                case KEY_F(F_BACK):
+                case KEY_F(F_EXIT):
+                        break;
+                }
+                touchwin(win);
+                refresh_all_windows(main_window);
+                if (res == 10 || res == ' ') {
+                        res = item_index(current_item(menu));
+                        break;
+                } else if (res == 27 || res == KEY_F(F_BACK) ||
+                                res == KEY_F(F_EXIT)) {
+                        res = KEY_EXIT;
+                        break;
+                }
+        }
+        unpost_menu(menu);
+        free_menu(menu);
+        for (i = 0; i < btn_num; i++)
+                free_item(btns[i]);
+        delwin(win);
+        return res;
+}
+int dialog_inputbox(WINDOW *main_window,
+                const char *title, const char *prompt,
+                const char *init, char *result, int result_len)
+{
+        int prompt_lines = 0;
+        int prompt_width = 0;
+        WINDOW *win;
+        WINDOW *prompt_win;
+        WINDOW *form_win;
+        PANEL *panel;
+        int i, x, y;
+        int res = -1;
+        int cursor_position = strlen(init);
+        /* find the widest line of msg: */
+        prompt_lines = get_line_no(prompt);
+        for (i = 0; i < prompt_lines; i++) {
+                const char *line = get_line(prompt, i);
+                int len = get_line_length(line);
+                prompt_width = max(prompt_width, len);
+        }
+        if (title)
+                prompt_width = max(prompt_width, strlen(title));
+        /* place dialog in middle of screen */
+        y = (LINES-(prompt_lines+4))/2;
+        x = (COLS-(prompt_width+4))/2;
+        strncpy(result, init, result_len);
+        /* create the windows */
+        win = newwin(prompt_lines+6, prompt_width+7, y, x);
+        prompt_win = derwin(win, prompt_lines+1, prompt_width, 2, 2);
+        form_win = derwin(win, 1, prompt_width, prompt_lines+3, 2);
+        keypad(form_win, TRUE);
+        wattrset(form_win, attributes[INPUT_FIELD]);
+        wattrset(win, attributes[INPUT_BOX]);
+        box(win, 0, 0);
+        wattrset(win, attributes[INPUT_HEADING]);
+        if (title)
+                mvwprintw(win, 0, 3, "%s", title);
+        /* print message */
+        wattrset(prompt_win, attributes[INPUT_TEXT]);
+        fill_window(prompt_win, prompt);
+        mvwprintw(form_win, 0, 0, "%*s", prompt_width, " ");
+        mvwprintw(form_win, 0, 0, "%s", result);
+        /* create panels */
+        panel = new_panel(win);
+        /* show the cursor */
+        curs_set(1);
+        touchwin(win);
+        refresh_all_windows(main_window);
+        while ((res = wgetch(form_win))) {
+                int len = strlen(result);
+                switch (res) {
+                case 10: /* ENTER */
+                case 27: /* ESCAPE */
+                case KEY_F(F_HELP):
+                case KEY_F(F_EXIT):
+                case KEY_F(F_BACK):
+                        break;
+                case 127:
+                case KEY_BACKSPACE:
+                        if (cursor_position > 0) {
+                                memmove(&result[cursor_position-1],
+                                                &result[cursor_position],
+                                                len-cursor_position+1);
+                                cursor_position--;
+                        }
+                        break;
+                case KEY_DC:
+                        if (cursor_position >= 0 && cursor_position < len) {
+                                memmove(&result[cursor_position],
+                                                &result[cursor_position+1],
+                                                len-cursor_position+1);
+                        }
+                        break;
+                case KEY_UP:
+                case KEY_RIGHT:
+                        if (cursor_position < len &&
+                            cursor_position < min(result_len, prompt_width))
+                                cursor_position++;
+                        break;
+                case KEY_DOWN:
+                case KEY_LEFT:
+                        if (cursor_position > 0)
+                                cursor_position--;
+                        break;
+                default:
+                        if ((isgraph(res) || isspace(res)) &&
+                                        len-2 < result_len) {
+                                /* insert the char at the proper position */
+                                memmove(&result[cursor_position+1],
+                                                &result[cursor_position],
+                                                len+1);
+                                result[cursor_position] = res;
+                                cursor_position++;
+                        } else {
+                                mvprintw(0, 0, "unknow key: %d\n", res);
+                        }
+                        break;
+                }
+                wmove(form_win, 0, 0);
+                wclrtoeol(form_win);
+                mvwprintw(form_win, 0, 0, "%*s", prompt_width, " ");
+                mvwprintw(form_win, 0, 0, "%s", result);
+                wmove(form_win, 0, cursor_position);
+                touchwin(win);
+                refresh_all_windows(main_window);
+                if (res == 10) {
+                        res = 0;
+                        break;
+                } else if (res == 27 || res == KEY_F(F_BACK) ||
+                                res == KEY_F(F_EXIT)) {
+                        res = KEY_EXIT;
+                        break;
+                } else if (res == KEY_F(F_HELP)) {
+                        res = 1;
+                        break;
+                }
+        }
+        /* hide the cursor */
+        curs_set(0);
+        del_panel(panel);
+        delwin(prompt_win);
+        delwin(form_win);
+        delwin(win);
+        return res;
+}
+/* refresh all windows in the correct order */
+void refresh_all_windows(WINDOW *main_window)
+{
+        update_panels();
+        touchwin(main_window);
+        refresh();
+}
+/* layman's scrollable window... */
+void show_scroll_win(WINDOW *main_window,
+                const char *title,
+                const char *text)
+{
+        int res;
+        int total_lines = get_line_no(text);
+        int x, y;
+        int start_x = 0, start_y = 0;
+        int text_lines = 0, text_cols = 0;
+        int total_cols = 0;
+        int win_cols = 0;
+        int win_lines = 0;
+        int i = 0;
+        WINDOW *win;
+        WINDOW *pad;
+        PANEL *panel;
+        /* find the widest line of msg: */
+        total_lines = get_line_no(text);
+        for (i = 0; i < total_lines; i++) {
+                const char *line = get_line(text, i);
+                int len = get_line_length(line);
+                total_cols = max(total_cols, len+2);
+        }
+        /* create the pad */
+        pad = newpad(total_lines+10, total_cols+10);
+        wattrset(pad, attributes[SCROLLWIN_TEXT]);
+        fill_window(pad, text);
+        win_lines = min(total_lines+4, LINES-2);
+        win_cols = min(total_cols+2, COLS-2);
+        text_lines = max(win_lines-4, 0);
+        text_cols = max(win_cols-2, 0);
+        /* place window in middle of screen */
+        y = (LINES-win_lines)/2;
+        x = (COLS-win_cols)/2;
+        win = newwin(win_lines, win_cols, y, x);
+        keypad(win, TRUE);
+        /* show the help in the help window, and show the help panel */
+        wattrset(win, attributes[SCROLLWIN_BOX]);
+        box(win, 0, 0);
+        wattrset(win, attributes[SCROLLWIN_HEADING]);
+        mvwprintw(win, 0, 3, " %s ", title);
+        panel = new_panel(win);
+        /* handle scrolling */
+        do {
+                copywin(pad, win, start_y, start_x, 2, 2, text_lines,
+                                text_cols, 0);
+                print_in_middle(win,
+                                text_lines+2,
+                                0,
+                                text_cols,
+                                "<OK>",
+                                attributes[DIALOG_MENU_FORE]);
+                wrefresh(win);
+                res = wgetch(win);
+                switch (res) {
+                case KEY_NPAGE:
+                case ' ':
+                        start_y += text_lines-2;
+                        break;
+                case KEY_PPAGE:
+                        start_y -= text_lines+2;
+                        break;
+                case KEY_HOME:
+                        start_y = 0;
+                        break;
+                case KEY_END:
+                        start_y = total_lines-text_lines;
+                        break;
+                case KEY_DOWN:
+                case 'j':
+                        start_y++;
+                        break;
+                case KEY_UP:
+                case 'k':
+                        start_y--;
+                        break;
+                case KEY_LEFT:
+                case 'h':
+                        start_x--;
+                        break;
+                case KEY_RIGHT:
+                case 'l':
+                        start_x++;
+                        break;
+                }
+                if (res == 10 || res == 27 || res == 'q'
+                    || res == KEY_F(F_BACK) || res == KEY_F(F_EXIT)) {
+                        break;
+                }
+                if (start_y < 0)
+                        start_y = 0;
+                if (start_y >= total_lines-text_lines)
+                        start_y = total_lines-text_lines;
+                if (start_x < 0)
+                        start_x = 0;
+                if (start_x >= total_cols-text_cols)
+                        start_x = total_cols-text_cols;
+        } while (res);
+        del_panel(panel);
+        delwin(win);
+        refresh_all_windows(main_window);
+}
diff --git a/scripts/kconfig/nconf.h b/scripts/kconfig/nconf.h
new file mode 100644
index 000000000000..fb4296666004
--- /dev/null
+++ b/scripts/kconfig/nconf.h
@@ -0,0 +1,95 @@
+/*
+ * Copyright (C) 2008 Nir Tzachar <nir.tzachar@gmail.com?
+ * Released under the terms of the GNU GPL v2.0.
+ *
+ * Derived from menuconfig.
+ *
+ */
+#include <ctype.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <limits.h>
+#include <stdarg.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include <locale.h>
+#include <curses.h>
+#include <menu.h>
+#include <panel.h>
+#include <form.h>
+#include <stdio.h>
+#include <time.h>
+#include <sys/time.h>
+#include "ncurses.h"
+#define max(a, b) ({\
+                typeof(a) _a = a;\
+                typeof(b) _b = b;\
+                _a > _b ? _a : _b; })
+#define min(a, b) ({\
+                typeof(a) _a = a;\
+                typeof(b) _b = b;\
+                _a < _b ? _a : _b; })
+typedef enum {
+        NORMAL = 1,
+        MAIN_HEADING,
+        MAIN_MENU_BOX,
+        MAIN_MENU_FORE,
+        MAIN_MENU_BACK,
+        MAIN_MENU_GREY,
+        MAIN_MENU_HEADING,
+        SCROLLWIN_TEXT,
+        SCROLLWIN_HEADING,
+        SCROLLWIN_BOX,
+        DIALOG_TEXT,
+        DIALOG_MENU_FORE,
+        DIALOG_MENU_BACK,
+        DIALOG_BOX,
+        INPUT_BOX,
+        INPUT_HEADING,
+        INPUT_TEXT,
+        INPUT_FIELD,
+        FUNCTION_TEXT,
+        FUNCTION_HIGHLIGHT,
+        ATTR_MAX
+} attributes_t;
+extern attributes_t attributes[];
+typedef enum {
+        F_HELP = 1,
+        F_SYMBOL = 2,
+        F_INSTS = 3,
+        F_CONF = 4,
+        F_BACK = 5,
+        F_SAVE = 6,
+        F_LOAD = 7,
+        F_EXIT = 8
+} function_key;
+void set_colors(void);
+/* this changes the windows attributes !!! */
+void print_in_middle(WINDOW *win,
+                int starty,
+                int startx,
+                int width,
+                const char *string,
+                chtype color);
+int get_line_length(const char *line);
+int get_line_no(const char *text);
+const char *get_line(const char *text, int line_no);
+void fill_window(WINDOW *win, const char *text);
+int btn_dialog(WINDOW *main_window, const char *msg, int btn_num, ...);
+int dialog_inputbox(WINDOW *main_window,
+                const char *title, const char *prompt,
+                const char *init, char *result, int result_len);
+void refresh_all_windows(WINDOW *main_window);
+void show_scroll_win(WINDOW *main_window,
+                const char *title,
+                const char *text);
diff --git a/scripts/kconfig/qconf.cc b/scripts/kconfig/qconf.cc
index 00c51507cfcc..820df2d1217b 100644
--- a/scripts/kconfig/qconf.cc
+++ b/scripts/kconfig/qconf.cc
@@ -58,11 +58,10 @@ QValueList<int> ConfigSettings::readSizes(const QString& key, bool *ok)
 {
        QValueList<int> result;
        QStringList entryList = readListEntry(key, ok);
-        if (ok) {
+        QStringList::Iterator it;
-                QStringList::Iterator it;
-                for (it = entryList.begin(); it != entryList.end(); ++it)
+        for (it = entryList.begin(); it != entryList.end(); ++it)
-                        result.push_back((*it).toInt());
+                result.push_back((*it).toInt());
-        }
        return result;
 }
@@ -149,7 +148,7 @@ void ConfigItem::updateMenu(void)
        case S_TRISTATE:
                char ch;
-                if (!sym_is_changable(sym) && !list->showAll) {
+                if (!sym_is_changable(sym) && list->optMode == normalOpt) {
                        setPixmap(promptColIdx, 0);
                        setText(noColIdx, QString::null);
                        setText(modColIdx, QString::null);
@@ -320,7 +319,7 @@ ConfigList::ConfigList(ConfigView* p, const char *name)
          symbolYesPix(xpm_symbol_yes), symbolModPix(xpm_symbol_mod), symbolNoPix(xpm_symbol_no),
          choiceYesPix(xpm_choice_yes), choiceNoPix(xpm_choice_no),
          menuPix(xpm_menu), menuInvPix(xpm_menu_inv), menuBackPix(xpm_menuback), voidPix(xpm_void),
-          showAll(false), showName(false), showRange(false), showData(false),
+          showName(false), showRange(false), showData(false), optMode(normalOpt),
          rootEntry(0), headerPopup(0)
 {
        int i;
@@ -337,10 +336,10 @@ ConfigList::ConfigList(ConfigView* p, const char *name)
        if (name) {
                configSettings->beginGroup(name);
-                showAll = configSettings->readBoolEntry("/showAll", false);
                showName = configSettings->readBoolEntry("/showName", false);
                showRange = configSettings->readBoolEntry("/showRange", false);
                showData = configSettings->readBoolEntry("/showData", false);
+                optMode = (enum optionMode)configSettings->readNumEntry("/optionMode", false);
                configSettings->endGroup();
                connect(configApp, SIGNAL(aboutToQuit()), SLOT(saveSettings()));
        }
@@ -352,6 +351,17 @@ ConfigList::ConfigList(ConfigView* p, const char *name)
        reinit();
 }
+bool ConfigList::menuSkip(struct menu *menu)
+{
+        if (optMode == normalOpt && menu_is_visible(menu))
+                return false;
+        if (optMode == promptOpt && menu_has_prompt(menu))
+                return false;
+        if (optMode == allOpt)
+                return false;
+        return true;
+}
 void ConfigList::reinit(void)
 {
        removeColumn(dataColIdx);
@@ -380,7 +390,7 @@ void ConfigList::saveSettings(void)
                configSettings->writeEntry("/showName", showName);
                configSettings->writeEntry("/showRange", showRange);
                configSettings->writeEntry("/showData", showData);
-                configSettings->writeEntry("/showAll", showAll);
+                configSettings->writeEntry("/optionMode", (int)optMode);
                configSettings->endGroup();
        }
 }
@@ -606,7 +616,7 @@ void ConfigList::updateMenuList(P* parent, struct menu* menu)
                }
                visible = menu_is_visible(child);
-                if (showAll || visible) {
+                if (!menuSkip(child)) {
                        if (!child->sym && !child->list && !child->prompt)
                                continue;
                        if (!item || item->menu != child)
@@ -835,7 +845,10 @@ void ConfigList::contextMenuEvent(QContextMenuEvent *e)
                e->ignore();
 }
-ConfigView* ConfigView::viewList;
+ConfigView*ConfigView::viewList;
+QAction *ConfigView::showNormalAction;
+QAction *ConfigView::showAllAction;
+QAction *ConfigView::showPromptAction;
 ConfigView::ConfigView(QWidget* parent, const char *name)
        : Parent(parent, name)
@@ -860,13 +873,16 @@ ConfigView::~ConfigView(void)
        }
 }
-void ConfigView::setShowAll(bool b)
+void ConfigView::setOptionMode(QAction *act)
 {
-        if (list->showAll != b) {
+        if (act == showNormalAction)
-                list->showAll = b;
+                list->optMode = normalOpt;
-                list->updateListAll();
+        else if (act == showAllAction)
-                emit showAllChanged(b);
+                list->optMode = allOpt;
-        }
+        else
+                list->optMode = promptOpt;
+        list->updateListAll();
 }
 void ConfigView::setShowName(bool b)
@@ -964,34 +980,6 @@ void ConfigInfoView::setInfo(struct menu *m)
                menuInfo();
 }
-void ConfigInfoView::setSource(const QString& name)
-{
-        const char *p = name.latin1();
-        menu = NULL;
-        sym = NULL;
-        switch (p[0]) {
-        case 'm':
-                struct menu *m;
-                if (sscanf(p, "m%p", &m) == 1 && menu != m) {
-                        menu = m;
-                        menuInfo();
-                        emit menuSelected(menu);
-                }
-                break;
-        case 's':
-                struct symbol *s;
-                if (sscanf(p, "s%p", &s) == 1 && sym != s) {
-                        sym = s;
-                        symbolInfo();
-                }
-                break;
-        }
-}
 void ConfigInfoView::symbolInfo(void)
 {
        QString str;
@@ -1349,11 +1337,24 @@ ConfigMainWindow::ConfigMainWindow(void)
          connect(showDataAction, SIGNAL(toggled(bool)), configView, SLOT(setShowData(bool)));
          connect(configView, SIGNAL(showDataChanged(bool)), showDataAction, SLOT(setOn(bool)));
          showDataAction->setOn(configList->showData);
-        QAction *showAllAction = new QAction(NULL, _("Show All Options"), 0, this);
-          showAllAction->setToggleAction(TRUE);
+        QActionGroup *optGroup = new QActionGroup(this);
-          connect(showAllAction, SIGNAL(toggled(bool)), configView, SLOT(setShowAll(bool)));
+        optGroup->setExclusive(TRUE);
-          connect(showAllAction, SIGNAL(toggled(bool)), menuView, SLOT(setShowAll(bool)));
+        connect(optGroup, SIGNAL(selected(QAction *)), configView,
-          showAllAction->setOn(configList->showAll);
+                SLOT(setOptionMode(QAction *)));
+        connect(optGroup, SIGNAL(selected(QAction *)), menuView,
+                SLOT(setOptionMode(QAction *)));
+        configView->showNormalAction = new QAction(NULL, _("Show Normal Options"), 0, optGroup);
+        configView->showAllAction = new QAction(NULL, _("Show All Options"), 0, optGroup);
+        configView->showPromptAction = new QAction(NULL, _("Show Prompt Options"), 0, optGroup);
+        configView->showNormalAction->setToggleAction(TRUE);
+        configView->showNormalAction->setOn(configList->optMode == normalOpt);
+        configView->showAllAction->setToggleAction(TRUE);
+        configView->showAllAction->setOn(configList->optMode == allOpt);
+        configView->showPromptAction->setToggleAction(TRUE);
+        configView->showPromptAction->setOn(configList->optMode == promptOpt);
        QAction *showDebugAction = new QAction(NULL, _("Show Debug Info"), 0, this);
          showDebugAction->setToggleAction(TRUE);
          connect(showDebugAction, SIGNAL(toggled(bool)), helpText, SLOT(setShowDebug(bool)));
@@ -1396,7 +1397,8 @@ ConfigMainWindow::ConfigMainWindow(void)
        showRangeAction->addTo(optionMenu);
        showDataAction->addTo(optionMenu);
        optionMenu->insertSeparator();
-        showAllAction->addTo(optionMenu);
+        optGroup->addTo(optionMenu);
+        optionMenu->insertSeparator();
        showDebugAction->addTo(optionMenu);
        // create help menu
@@ -1491,7 +1493,7 @@ void ConfigMainWindow::setMenuLink(struct menu *menu)
        ConfigList* list = NULL;
        ConfigItem* item;
-        if (!menu_is_visible(menu) && !configView->showAll())
+        if (configList->menuSkip(menu))
                return;
        switch (configList->mode) {
diff --git a/scripts/kconfig/qconf.h b/scripts/kconfig/qconf.h
index b3b5657b6b35..636a74b23bf9 100644
--- a/scripts/kconfig/qconf.h
+++ b/scripts/kconfig/qconf.h
@@ -44,6 +44,9 @@ enum colIdx {
 enum listMode {
        singleMode, menuMode, symbolMode, fullMode, listMode
 };
+enum optionMode {
+        normalOpt = 0, allOpt, promptOpt
+};
 class ConfigList : public QListView {
        Q_OBJECT
@@ -115,6 +118,8 @@ public:
        void setAllOpen(bool open);
        void setParentMenu(void);
+        bool menuSkip(struct menu *);
        template <class P>
        void updateMenuList(P*, struct menu*);
@@ -124,8 +129,9 @@ public:
        QPixmap choiceYesPix, choiceNoPix;
        QPixmap menuPix, menuInvPix, menuBackPix, voidPix;
-        bool showAll, showName, showRange, showData;
+        bool showName, showRange, showData;
        enum listMode mode;
+        enum optionMode optMode;
        struct menu *rootEntry;
        QColorGroup disabledColorGroup;
        QColorGroup inactivedColorGroup;
@@ -222,17 +228,15 @@ public:
        static void updateList(ConfigItem* item);
        static void updateListAll(void);
-        bool showAll(void) const { return list->showAll; }
        bool showName(void) const { return list->showName; }
        bool showRange(void) const { return list->showRange; }
        bool showData(void) const { return list->showData; }
 public slots:
-        void setShowAll(bool);
        void setShowName(bool);
        void setShowRange(bool);
        void setShowData(bool);
+        void setOptionMode(QAction *);
 signals:
-        void showAllChanged(bool);
        void showNameChanged(bool);
        void showRangeChanged(bool);
        void showDataChanged(bool);
@@ -242,6 +246,10 @@ public:
        static ConfigView* viewList;
        ConfigView* nextView;
+        static QAction *showNormalAction;
+        static QAction *showAllAction;
+        static QAction *showPromptAction;
 };
 class ConfigInfoView : public QTextBrowser {
@@ -254,7 +262,6 @@ public:
 public slots:
        void setInfo(struct menu *menu);
        void saveSettings(void);
-        void setSource(const QString& name);
        void setShowDebug(bool);
 signals:
diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl
index afbd54ac1d83..c70a27d924f0 100644
--- a/scripts/kconfig/streamline_config.pl
+++ b/scripts/kconfig/streamline_config.pl
@@ -115,7 +115,9 @@ my $ksource = $ARGV[0];
 my $kconfig = $ARGV[1];
 my $lsmod_file = $ARGV[2];
-my @makefiles = `find $ksource -name Makefile`;
+my @makefiles = `find $ksource -name Makefile 2>/dev/null`;
+chomp @makefiles;
 my %depends;
 my %selects;
 my %prompts;
@@ -215,7 +217,6 @@ if ($kconfig) {
 # Read all Makefiles to map the configs to the objects
 foreach my $makefile (@makefiles) {
-    chomp $makefile;
    open(MIN,$makefile) || die "Can't open $makefile";
    while (<MIN>) {
@@ -242,7 +243,7 @@ foreach my $makefile (@makefiles) {
            foreach my $obj (split /\s+/,$objs) {
                $obj =~ s/-/_/g;
                if ($obj =~ /(.*)\.o$/) {
-                    # Objects may bes enabled by more than one config.
+                    # Objects may be enabled by more than one config.
                    # Store configs in an array.
                    my @arr;
@@ -307,7 +308,7 @@ close (LIN);
 my %configs;
 foreach my $module (keys(%modules)) {
    if (defined($objects{$module})) {
-        @arr = @{$objects{$module}};
+        my @arr = @{$objects{$module}};
        foreach my $conf (@arr) {
            $configs{$conf} = $module;
        }
diff --git a/scripts/kconfig/symbol.c b/scripts/kconfig/symbol.c
index 6c8fbbb66ebc..e95718fea355 100644
--- a/scripts/kconfig/symbol.c
+++ b/scripts/kconfig/symbol.c
@@ -205,6 +205,16 @@ static void sym_calc_visibility(struct symbol *sym)
        }
        if (sym_is_choice_value(sym))
                return;
+        /* defaulting to "yes" if no explicit "depends on" are given */
+        tri = yes;
+        if (sym->dir_dep.expr)
+                tri = expr_calc_value(sym->dir_dep.expr);
+        if (tri == mod)
+                tri = yes;
+        if (sym->dir_dep.tri != tri) {
+                sym->dir_dep.tri = tri;
+                sym_set_changed(sym);
+        }
        tri = no;
        if (sym->rev_dep.expr)
                tri = expr_calc_value(sym->rev_dep.expr);
@@ -216,44 +226,63 @@ static void sym_calc_visibility(struct symbol *sym)
        }
 }
-static struct symbol *sym_calc_choice(struct symbol *sym)
+/*
+ * Find the default symbol for a choice.
+ * First try the default values for the choice symbol
+ * Next locate the first visible choice value
+ * Return NULL if none was found
+ */
+struct symbol *sym_choice_default(struct symbol *sym)
 {
        struct symbol *def_sym;
        struct property *prop;
        struct expr *e;
-        /* is the user choice visible? */
-        def_sym = sym->def[S_DEF_USER].val;
-        if (def_sym) {
-                sym_calc_visibility(def_sym);
-                if (def_sym->visible != no)
-                        return def_sym;
-        }
        /* any of the defaults visible? */
        for_all_defaults(sym, prop) {
                prop->visible.tri = expr_calc_value(prop->visible.expr);
                if (prop->visible.tri == no)
                        continue;
                def_sym = prop_get_symbol(prop);
-                sym_calc_visibility(def_sym);
                if (def_sym->visible != no)
                        return def_sym;
        }
        /* just get the first visible value */
        prop = sym_get_choice_prop(sym);
-        expr_list_for_each_sym(prop->expr, e, def_sym) {
+        expr_list_for_each_sym(prop->expr, e, def_sym)
-                sym_calc_visibility(def_sym);
                if (def_sym->visible != no)
                        return def_sym;
-        }
-        /* no choice? reset tristate value */
+        /* failed to locate any defaults */
-        sym->curr.tri = no;
        return NULL;
 }
+static struct symbol *sym_calc_choice(struct symbol *sym)
+{
+        struct symbol *def_sym;
+        struct property *prop;
+        struct expr *e;
+        /* first calculate all choice values' visibilities */
+        prop = sym_get_choice_prop(sym);
+        expr_list_for_each_sym(prop->expr, e, def_sym)
+                sym_calc_visibility(def_sym);
+        /* is the user choice visible? */
+        def_sym = sym->def[S_DEF_USER].val;
+        if (def_sym && def_sym->visible != no)
+                return def_sym;
+        def_sym = sym_choice_default(sym);
+        if (def_sym == NULL)
+                /* no choice? reset tristate value */
+                sym->curr.tri = no;
+        return def_sym;
+}
 void sym_calc_value(struct symbol *sym)
 {
        struct symbol_value newval, oldval;
@@ -321,6 +350,14 @@ void sym_calc_value(struct symbol *sym)
                                }
                        }
                calc_newval:
+                        if (sym->dir_dep.tri == no && sym->rev_dep.tri != no) {
+                                fprintf(stderr, "warning: (");
+                                expr_fprint(sym->rev_dep.expr, stderr);
+                                fprintf(stderr, ") selects %s which has unmet direct dependencies (",
+                                        sym->name);
+                                expr_fprint(sym->dir_dep.expr, stderr);
+                                fprintf(stderr, ")\n");
+                        }
                        newval.tri = EXPR_OR(newval.tri, sym->rev_dep.tri);
                }
                if (newval.tri == mod && sym_get_type(sym) == S_BOOLEAN)
@@ -365,12 +402,13 @@ void sym_calc_value(struct symbol *sym)
        if (sym_is_choice(sym)) {
                struct symbol *choice_sym;
-                int flags = sym->flags & (SYMBOL_CHANGED | SYMBOL_WRITE);
                prop = sym_get_choice_prop(sym);
                expr_list_for_each_sym(prop->expr, e, choice_sym) {
-                        choice_sym->flags |= flags;
+                        if ((sym->flags & SYMBOL_WRITE) &&
-                        if (flags & SYMBOL_CHANGED)
+                            choice_sym->visible != no)
+                                choice_sym->flags |= SYMBOL_WRITE;
+                        if (sym->flags & SYMBOL_CHANGED)
                                sym_set_changed(choice_sym);
                }
        }
@@ -623,6 +661,80 @@ bool sym_set_string_value(struct symbol *sym, const char *newval)
        return true;
 }
+/*
+ * Find the default value associated to a symbol.
+ * For tristate symbol handle the modules=n case
+ * in which case "m" becomes "y".
+ * If the symbol does not have any default then fallback
+ * to the fixed default values.
+ */
+const char *sym_get_string_default(struct symbol *sym)
+{
+        struct property *prop;
+        struct symbol *ds;
+        const char *str;
+        tristate val;
+        sym_calc_visibility(sym);
+        sym_calc_value(modules_sym);
+        val = symbol_no.curr.tri;
+        str = symbol_empty.curr.val;
+        /* If symbol has a default value look it up */
+        prop = sym_get_default_prop(sym);
+        if (prop != NULL) {
+                switch (sym->type) {
+                case S_BOOLEAN:
+                case S_TRISTATE:
+                        /* The visibility imay limit the value from yes => mod */
+                        val = EXPR_AND(expr_calc_value(prop->expr), prop->visible.tri);
+                        break;
+                default:
+                        /*
+                         * The following fails to handle the situation
+                         * where a default value is further limited by
+                         * the valid range.
+                         */
+                        ds = prop_get_symbol(prop);
+                        if (ds != NULL) {
+                                sym_calc_value(ds);
+                                str = (const char *)ds->curr.val;
+                        }
+                }
+        }
+        /* Handle select statements */
+        val = EXPR_OR(val, sym->rev_dep.tri);
+        /* transpose mod to yes if modules are not enabled */
+        if (val == mod)
+                if (!sym_is_choice_value(sym) && modules_sym->curr.tri == no)
+                        val = yes;
+        /* transpose mod to yes if type is bool */
+        if (sym->type == S_BOOLEAN && val == mod)
+                val = yes;
+        switch (sym->type) {
+        case S_BOOLEAN:
+        case S_TRISTATE:
+                switch (val) {
+                case no: return "n";
+                case mod: return "m";
+                case yes: return "y";
+                }
+        case S_INT:
+        case S_HEX:
+                return str;
+        case S_STRING:
+                return str;
+        case S_OTHER:
+        case S_UNKNOWN:
+                break;
+        }
+        return "";
+}
 const char *sym_get_string_value(struct symbol *sym)
 {
        tristate val;
@@ -651,12 +763,20 @@ bool sym_is_changable(struct symbol *sym)
        return sym->visible > sym->rev_dep.tri;
 }
+static unsigned strhash(const char *s)
+{
+        /* fnv32 hash */
+        unsigned hash = 2166136261U;
+        for (; *s; s++)
+                hash = (hash ^ *s) * 0x01000193;
+        return hash;
+}
 struct symbol *sym_lookup(const char *name, int flags)
 {
        struct symbol *symbol;
-        const char *ptr;
        char *new_name;
-        int hash = 0;
+        int hash;
        if (name) {
                if (name[0] && !name[1]) {
@@ -666,12 +786,11 @@ struct symbol *sym_lookup(const char *name, int flags)
                        case 'n': return &symbol_no;
                        }
                }
-                for (ptr = name; *ptr; ptr++)
+                hash = strhash(name) % SYMBOL_HASHSIZE;
-                        hash += *ptr;
-                hash &= 0xff;
                for (symbol = symbol_hash[hash]; symbol; symbol = symbol->next) {
-                        if (!strcmp(symbol->name, name) &&
+                        if (symbol->name &&
+                            !strcmp(symbol->name, name) &&
                            (flags ? symbol->flags & flags
                                   : !(symbol->flags & (SYMBOL_CONST|SYMBOL_CHOICE))))
                                return symbol;
@@ -679,7 +798,7 @@ struct symbol *sym_lookup(const char *name, int flags)
                new_name = strdup(name);
        } else {
                new_name = NULL;
-                hash = 256;
+                hash = 0;
        }
        symbol = malloc(sizeof(*symbol));
@@ -697,7 +816,6 @@ struct symbol *sym_lookup(const char *name, int flags)
 struct symbol *sym_find(const char *name)
 {
        struct symbol *symbol = NULL;
-        const char *ptr;
        int hash = 0;
        if (!name)
@@ -710,12 +828,11 @@ struct symbol *sym_find(const char *name)
                case 'n': return &symbol_no;
                }
        }
-        for (ptr = name; *ptr; ptr++)
+        hash = strhash(name) % SYMBOL_HASHSIZE;
-                hash += *ptr;
-        hash &= 0xff;
        for (symbol = symbol_hash[hash]; symbol; symbol = symbol->next) {
-                if (!strcmp(symbol->name, name) &&
+                if (symbol->name &&
+                    !strcmp(symbol->name, name) &&
                    !(symbol->flags & SYMBOL_CONST))
                                break;
        }
@@ -750,6 +867,7 @@ struct symbol **sym_re_search(const char *pattern)
                                return NULL;
                        }
                }
+                sym_calc_value(sym);
                sym_arr[cnt++] = sym;
        }
        if (sym_arr)
@@ -759,6 +877,110 @@ struct symbol **sym_re_search(const char *pattern)
        return sym_arr;
 }
+/*
+ * When we check for recursive dependencies we use a stack to save
+ * current state so we can print out relevant info to user.
+ * The entries are located on the call stack so no need to free memory.
+ * Note inser() remove() must always match to properly clear the stack.
+ */
+static struct dep_stack {
+        struct dep_stack *prev, *next;
+        struct symbol *sym;
+        struct property *prop;
+        struct expr *expr;
+} *check_top;
+static void dep_stack_insert(struct dep_stack *stack, struct symbol *sym)
+{
+        memset(stack, 0, sizeof(*stack));
+        if (check_top)
+                check_top->next = stack;
+        stack->prev = check_top;
+        stack->sym = sym;
+        check_top = stack;
+}
+static void dep_stack_remove(void)
+{
+        check_top = check_top->prev;
+        if (check_top)
+                check_top->next = NULL;
+}
+/*
+ * Called when we have detected a recursive dependency.
+ * check_top point to the top of the stact so we use
+ * the ->prev pointer to locate the bottom of the stack.
+ */
+static void sym_check_print_recursive(struct symbol *last_sym)
+{
+        struct dep_stack *stack;
+        struct symbol *sym, *next_sym;
+        struct menu *menu = NULL;
+        struct property *prop;
+        struct dep_stack cv_stack;
+        if (sym_is_choice_value(last_sym)) {
+                dep_stack_insert(&cv_stack, last_sym);
+                last_sym = prop_get_symbol(sym_get_choice_prop(last_sym));
+        }
+        for (stack = check_top; stack != NULL; stack = stack->prev)
+                if (stack->sym == last_sym)
+                        break;
+        if (!stack) {
+                fprintf(stderr, "unexpected recursive dependency error\n");
+                return;
+        }
+        for (; stack; stack = stack->next) {
+                sym = stack->sym;
+                next_sym = stack->next ? stack->next->sym : last_sym;
+                prop = stack->prop;
+                /* for choice values find the menu entry (used below) */
+                if (sym_is_choice(sym) || sym_is_choice_value(sym)) {
+                        for (prop = sym->prop; prop; prop = prop->next) {
+                                menu = prop->menu;
+                                if (prop->menu)
+                                        break;
+                        }
+                }
+                if (stack->sym == last_sym)
+                        fprintf(stderr, "%s:%d:error: recursive dependency detected!\n",
+                                prop->file->name, prop->lineno);
+                if (stack->expr) {
+                        fprintf(stderr, "%s:%d:\tsymbol %s %s value contains %s\n",
+                                prop->file->name, prop->lineno,
+                                sym->name ? sym->name : "<choice>",
+                                prop_get_type_name(prop->type),
+                                next_sym->name ? next_sym->name : "<choice>");
+                } else if (stack->prop) {
+                        fprintf(stderr, "%s:%d:\tsymbol %s depends on %s\n",
+                                prop->file->name, prop->lineno,
+                                sym->name ? sym->name : "<choice>",
+                                next_sym->name ? next_sym->name : "<choice>");
+                } else if (sym_is_choice(sym)) {
+                        fprintf(stderr, "%s:%d:\tchoice %s contains symbol %s\n",
+                                menu->file->name, menu->lineno,
+                                sym->name ? sym->name : "<choice>",
+                                next_sym->name ? next_sym->name : "<choice>");
+                } else if (sym_is_choice_value(sym)) {
+                        fprintf(stderr, "%s:%d:\tsymbol %s is part of choice %s\n",
+                                menu->file->name, menu->lineno,
+                                sym->name ? sym->name : "<choice>",
+                                next_sym->name ? next_sym->name : "<choice>");
+                } else {
+                        fprintf(stderr, "%s:%d:\tsymbol %s is selected by %s\n",
+                                prop->file->name, prop->lineno,
+                                sym->name ? sym->name : "<choice>",
+                                next_sym->name ? next_sym->name : "<choice>");
+                }
+        }
+        if (check_top == &cv_stack)
+                dep_stack_remove();
+}
 static struct symbol *sym_check_expr_deps(struct expr *e)
 {
@@ -795,24 +1017,33 @@ static struct symbol *sym_check_sym_deps(struct symbol *sym)
 {
        struct symbol *sym2;
        struct property *prop;
+        struct dep_stack stack;
+        dep_stack_insert(&stack, sym);
        sym2 = sym_check_expr_deps(sym->rev_dep.expr);
        if (sym2)
-                return sym2;
+                goto out;
        for (prop = sym->prop; prop; prop = prop->next) {
                if (prop->type == P_CHOICE || prop->type == P_SELECT)
                        continue;
+                stack.prop = prop;
                sym2 = sym_check_expr_deps(prop->visible.expr);
                if (sym2)
                        break;
                if (prop->type != P_DEFAULT || sym_is_choice(sym))
                        continue;
+                stack.expr = prop->expr;
                sym2 = sym_check_expr_deps(prop->expr);
                if (sym2)
                        break;
+                stack.expr = NULL;
        }
+out:
+        dep_stack_remove();
        return sym2;
 }
@@ -821,6 +1052,9 @@ static struct symbol *sym_check_choice_deps(struct symbol *choice)
        struct symbol *sym, *sym2;
        struct property *prop;
        struct expr *e;
+        struct dep_stack stack;
+        dep_stack_insert(&stack, choice);
        prop = sym_get_choice_prop(choice);
        expr_list_for_each_sym(prop->expr, e, sym)
@@ -834,10 +1068,8 @@ static struct symbol *sym_check_choice_deps(struct symbol *choice)
        expr_list_for_each_sym(prop->expr, e, sym) {
                sym2 = sym_check_sym_deps(sym);
-                if (sym2) {
+                if (sym2)
-                        fprintf(stderr, " -> %s", sym->name);
                        break;
-                }
        }
 out:
        expr_list_for_each_sym(prop->expr, e, sym)
@@ -847,6 +1079,8 @@ out:
            prop_get_symbol(sym_get_choice_prop(sym2)) == choice)
                sym2 = choice;
+        dep_stack_remove();
        return sym2;
 }
@@ -856,18 +1090,20 @@ struct symbol *sym_check_deps(struct symbol *sym)
        struct property *prop;
        if (sym->flags & SYMBOL_CHECK) {
-                fprintf(stderr, "%s:%d:error: found recursive dependency: %s",
+                sym_check_print_recursive(sym);
-                        sym->prop->file->name, sym->prop->lineno,
-                        sym->name ? sym->name : "<choice>");
                return sym;
        }
        if (sym->flags & SYMBOL_CHECKED)
                return NULL;
        if (sym_is_choice_value(sym)) {
+                struct dep_stack stack;
                /* for choice groups start the check with main choice symbol */
+                dep_stack_insert(&stack, sym);
                prop = sym_get_choice_prop(sym);
                sym2 = sym_check_deps(prop_get_symbol(prop));
+                dep_stack_remove();
        } else if (sym_is_choice(sym)) {
                sym2 = sym_check_choice_deps(sym);
        } else {
@@ -876,14 +1112,8 @@ struct symbol *sym_check_deps(struct symbol *sym)
                sym->flags &= ~SYMBOL_CHECK;
        }
-        if (sym2) {
+        if (sym2 && sym2 == sym)
-                fprintf(stderr, " -> %s", sym->name ? sym->name : "<choice>");
+                sym2 = NULL;
-                if (sym2 == sym) {
-                        fprintf(stderr, "\n");
-                        zconfnerrs++;
-                        sym2 = NULL;
-                }
-        }
        return sym2;
 }
@@ -937,6 +1167,8 @@ const char *prop_get_type_name(enum prop_type type)
                return "select";
        case P_RANGE:
                return "range";
+        case P_SYMBOL:
+                return "symbol";
        case P_UNKNOWN:
                break;
        }
diff --git a/scripts/kconfig/util.c b/scripts/kconfig/util.c
index b6b2a46af14c..78b5c04e736b 100644
--- a/scripts/kconfig/util.c
+++ b/scripts/kconfig/util.c
@@ -72,12 +72,13 @@ int file_write_dep(const char *name)
 }
-/* Allocate initial growable sting */
+/* Allocate initial growable string */
 struct gstr str_new(void)
 {
        struct gstr gs;
        gs.s = malloc(sizeof(char) * 64);
        gs.len = 64;
+        gs.max_width = 0;
        strcpy(gs.s, "\0");
        return gs;
 }
@@ -88,6 +89,7 @@ struct gstr str_assign(const char *s)
        struct gstr gs;
        gs.s = strdup(s);
        gs.len = strlen(s) + 1;
+        gs.max_width = 0;
        return gs;
 }
diff --git a/scripts/kconfig/zconf.tab.c_shipped b/scripts/kconfig/zconf.tab.c_shipped
index 6e9dcd59aa87..32a9eefd842c 100644
--- a/scripts/kconfig/zconf.tab.c_shipped
+++ b/scripts/kconfig/zconf.tab.c_shipped
@@ -104,7 +104,7 @@ static void zconf_error(const char *err, ...);
 static void zconferror(const char *err);
 static bool zconf_endtoken(struct kconf_id *id, int starttoken, int endtoken);
-struct symbol *symbol_hash[257];
+struct symbol *symbol_hash[SYMBOL_HASHSIZE];
 static struct menu *current_menu, *current_entry;
@@ -2220,7 +2220,7 @@ void conf_parse(const char *name)
        zconf_initscan(name);
        sym_init();
-        menu_init();
+        _menu_init();
        modules_sym = sym_lookup(NULL, 0);
        modules_sym->type = S_BOOLEAN;
        modules_sym->flags |= SYMBOL_AUTO;
@@ -2336,9 +2336,9 @@ static void print_symbol(FILE *out, struct menu *menu)
        struct property *prop;
        if (sym_is_choice(sym))
-                fprintf(out, "choice\n");
+                fprintf(out, "\nchoice\n");
        else
-                fprintf(out, "config %s\n", sym->name);
+                fprintf(out, "\nconfig %s\n", sym->name);
        switch (sym->type) {
        case S_BOOLEAN:
                fputs("  boolean\n", out);
@@ -2384,6 +2384,21 @@ static void print_symbol(FILE *out, struct menu *menu)
                case P_CHOICE:
                        fputs("  #choice value\n", out);
                        break;
+                case P_SELECT:
+                        fputs( "  select ", out);
+                        expr_fprint(prop->expr, out);
+                        fputc('\n', out);
+                        break;
+                case P_RANGE:
+                        fputs( "  range ", out);
+                        expr_fprint(prop->expr, out);
+                        fputc('\n', out);
+                        break;
+                case P_MENU:
+                        fputs( "  menu ", out);
+                        print_quoted_string(out, prop->text);
+                        fputc('\n', out);
+                        break;
                default:
                        fprintf(out, "  unknown prop %d!\n", prop->type);
                        break;
@@ -2395,7 +2410,6 @@ static void print_symbol(FILE *out, struct menu *menu)
                        menu->help[len] = 0;
                fprintf(out, "  help\n%s\n", menu->help);
        }
-        fputc('\n', out);
 }
 void zconfdump(FILE *out)
@@ -2428,7 +2442,6 @@ void zconfdump(FILE *out)
                                expr_fprint(prop->visible.expr, out);
                                fputc('\n', out);
                        }
-                        fputs("\n", out);
                }
                if (menu->list)
diff --git a/scripts/kconfig/zconf.y b/scripts/kconfig/zconf.y
index 8c43491f8cc9..23dfd3baa7a1 100644
--- a/scripts/kconfig/zconf.y
+++ b/scripts/kconfig/zconf.y
@@ -27,7 +27,7 @@ static void zconf_error(const char *err, ...);
 static void zconferror(const char *err);
 static bool zconf_endtoken(struct kconf_id *id, int starttoken, int endtoken);
-struct symbol *symbol_hash[257];
+struct symbol *symbol_hash[SYMBOL_HASHSIZE];
 static struct menu *current_menu, *current_entry;
@@ -475,7 +475,7 @@ void conf_parse(const char *name)
        zconf_initscan(name);
        sym_init();
-        menu_init();
+        _menu_init();
        modules_sym = sym_lookup(NULL, 0);
        modules_sym->type = S_BOOLEAN;
        modules_sym->flags |= SYMBOL_AUTO;
@@ -591,9 +591,9 @@ static void print_symbol(FILE *out, struct menu *menu)
        struct property *prop;
        if (sym_is_choice(sym))
-                fprintf(out, "choice\n");
+                fprintf(out, "\nchoice\n");
        else
-                fprintf(out, "config %s\n", sym->name);
+                fprintf(out, "\nconfig %s\n", sym->name);
        switch (sym->type) {
        case S_BOOLEAN:
                fputs("  boolean\n", out);
@@ -639,6 +639,21 @@ static void print_symbol(FILE *out, struct menu *menu)
                case P_CHOICE:
                        fputs("  #choice value\n", out);
                        break;
+                case P_SELECT:
+                        fputs( "  select ", out);
+                        expr_fprint(prop->expr, out);
+                        fputc('\n', out);
+                        break;
+                case P_RANGE:
+                        fputs( "  range ", out);
+                        expr_fprint(prop->expr, out);
+                        fputc('\n', out);
+                        break;
+                case P_MENU:
+                        fputs( "  menu ", out);
+                        print_quoted_string(out, prop->text);
+                        fputc('\n', out);
+                        break;
                default:
                        fprintf(out, "  unknown prop %d!\n", prop->type);
                        break;
@@ -650,7 +665,6 @@ static void print_symbol(FILE *out, struct menu *menu)
                        menu->help[len] = 0;
                fprintf(out, "  help\n%s\n", menu->help);
        }
-        fputc('\n', out);
 }
 void zconfdump(FILE *out)
@@ -683,7 +697,6 @@ void zconfdump(FILE *out)
                                expr_fprint(prop->visible.expr, out);
                                fputc('\n', out);
                        }
-                        fputs("\n", out);
                }
                if (menu->list)
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/markup_oops.pl b/scripts/markup_oops.pl
index e950f9cde019..827896f56501 100644
--- a/scripts/markup_oops.pl
+++ b/scripts/markup_oops.pl
@@ -2,6 +2,7 @@
 use File::Basename;
 use Math::BigInt;
+use Getopt::Long;
 # Copyright 2008, Intel Corporation
 #
@@ -15,6 +16,16 @@ use Math::BigInt;
 #       Arjan van de Ven <arjan@linux.intel.com>
+my $cross_compile = "";
+my $vmlinux_name = "";
+my $modulefile = "";
+# Get options
+Getopt::Long::GetOptions(
+        'cross-compile|c=s'     => \$cross_compile,
+        'module|m=s'            => \$modulefile,
+        'help|h'                => \&usage,
+) || usage ();
 my $vmlinux_name = $ARGV[0];
 if (!defined($vmlinux_name)) {
        my $kerver = `uname -r`;
@@ -23,9 +34,8 @@ if (!defined($vmlinux_name)) {
        print "No vmlinux specified, assuming $vmlinux_name\n";
 }
 my $filename = $vmlinux_name;
-#
-# Step 1: Parse the oops to find the EIP value
+# Parse the oops to find the EIP value
-#
 my $target = "0";
 my $function;
@@ -177,26 +187,26 @@ my $decodestart = Math::BigInt->from_hex("0x$target") - Math::BigInt->from_hex("
 my $decodestop = Math::BigInt->from_hex("0x$target") + 8192;
 if ($target eq "0") {
        print "No oops found!\n";
-        print "Usage: \n";
+        usage();
-        print "    dmesg | perl scripts/markup_oops.pl vmlinux\n";
-        exit;
 }
 # if it's a module, we need to find the .ko file and calculate a load offset
 if ($module ne "") {
-        my $modulefile = `modinfo $module | grep '^filename:' | awk '{ print \$2 }'`;
+        if ($modulefile eq "") {
-        chomp($modulefile);
+                $modulefile = `modinfo -F filename $module`;
+                chomp($modulefile);
+        }
        $filename = $modulefile;
        if ($filename eq "") {
                print "Module .ko file for $module not found. Aborting\n";
                exit;
        }
        # ok so we found the module, now we need to calculate the vma offset
-        open(FILE, "objdump -dS $filename |") || die "Cannot start objdump";
+        open(FILE, $cross_compile."objdump -dS $filename |") || die "Cannot start objdump";
        while (<FILE>) {
                if ($_ =~ /^([0-9a-f]+) \<$function\>\:/) {
                        my $fu = $1;
-                        $vmaoffset = hex($target) - hex($fu) - hex($func_offset);
+                        $vmaoffset = Math::BigInt->from_hex("0x$target") - Math::BigInt->from_hex("0x$fu") - Math::BigInt->from_hex("0x$func_offset");
                }
        }
        close(FILE);
@@ -204,7 +214,7 @@ if ($module ne "") {
 my $counter = 0;
 my $state   = 0;
-my $center  = 0;
+my $center  = -1;
 my @lines;
 my @reglines;
@@ -212,7 +222,7 @@ sub InRange {
        my ($address, $target) = @_;
        my $ad = "0x".$address;
        my $ta = "0x".$target;
-        my $delta = hex($ad) - hex($ta);
+        my $delta = Math::BigInt->from_hex($ad) - Math::BigInt->from_hex($ta);
        if (($delta > -4096) && ($delta < 4096)) {
                return 1;
@@ -225,7 +235,7 @@ sub InRange {
 # first, parse the input into the lines array, but to keep size down,
 # we only do this for 4Kb around the sweet spot
-open(FILE, "objdump -dS --adjust-vma=$vmaoffset --start-address=$decodestart --stop-address=$decodestop $filename |") || die "Cannot start objdump";
+open(FILE, $cross_compile."objdump -dS --adjust-vma=$vmaoffset --start-address=$decodestart --stop-address=$decodestop $filename |") || die "Cannot start objdump";
 while (<FILE>) {
        my $line = $_;
@@ -236,7 +246,8 @@ while (<FILE>) {
                                $state = 1;
                        }
                }
-        } else {
+        }
+        if ($state == 1) {
                if ($line =~ /^([a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]+)\:/) {
                        my $val = $1;
                        if (!InRange($val, $target)) {
@@ -259,7 +270,7 @@ if ($counter == 0) {
        exit;
 }
-if ($center == 0) {
+if ($center == -1) {
        print "No matching code found \n";
        exit;
 }
@@ -344,3 +355,16 @@ while ($i < $finish) {
        $i = $i +1;
 }
+sub usage {
+        print <<EOT;
+Usage:
+  dmesg | perl $0 [OPTION] [VMLINUX]
+OPTION:
+  -c, --cross-compile CROSS_COMPILE     Specify the prefix used for toolchain.
+  -m, --module MODULE_DIRNAME           Specify the module filename.
+  -h, --help                            Help.
+EOT
+        exit;
+}
diff --git a/scripts/mkcompile_h b/scripts/mkcompile_h
index 23dbad80cce9..50ad317a4bf9 100755
--- a/scripts/mkcompile_h
+++ b/scripts/mkcompile_h
@@ -67,9 +67,8 @@ UTS_TRUNCATE="cut -b -$UTS_LEN"
  echo \#define LINUX_COMPILE_BY \"`whoami`\"
  echo \#define LINUX_COMPILE_HOST \"`hostname | $UTS_TRUNCATE`\"
-  if [ -x /bin/dnsdomainname ]; then
+  domain=`dnsdomainname 2> /dev/null`
-    domain=`dnsdomainname 2> /dev/null`
+  if [ -z "$domain" ]; then
-  elif [ -x /bin/domainname ]; then
    domain=`domainname 2> /dev/null`
  fi
diff --git a/scripts/mod/file2alias.c b/scripts/mod/file2alias.c
index 220213e603db..88f3f07205f8 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -796,6 +796,51 @@ static int do_platform_entry(const char *filename,
        return 1;
 }
+static int do_mdio_entry(const char *filename,
+                         struct mdio_device_id *id, char *alias)
+{
+        int i;
+        alias += sprintf(alias, MDIO_MODULE_PREFIX);
+        for (i = 0; i < 32; i++) {
+                if (!((id->phy_id_mask >> (31-i)) & 1))
+                        *(alias++) = '?';
+                else if ((id->phy_id >> (31-i)) & 1)
+                        *(alias++) = '1';
+                else
+                        *(alias++) = '0';
+        }
+        /* Terminate the string */
+        *alias = 0;
+        return 1;
+}
+/* Looks like: zorro:iN. */
+static int do_zorro_entry(const char *filename, struct zorro_device_id *id,
+                          char *alias)
+{
+        id->id = TO_NATIVE(id->id);
+        strcpy(alias, "zorro:");
+        ADD(alias, "i", id->id != ZORRO_WILDCARD, id->id);
+        return 1;
+}
+/* looks like: "pnp:dD" */
+static int do_isapnp_entry(const char *filename,
+                           struct isapnp_device_id *id, char *alias)
+{
+        sprintf(alias, "pnp:d%c%c%c%x%x%x%x*",
+                'A' + ((id->vendor >> 2) & 0x3f) - 1,
+                'A' + (((id->vendor & 3) << 3) | ((id->vendor >> 13) & 7)) - 1,
+                'A' + ((id->vendor >> 8) & 0x1f) - 1,
+                (id->function >> 4) & 0x0f, id->function & 0x0f,
+                (id->function >> 12) & 0x0f, (id->function >> 8) & 0x0f);
+        return 1;
+}
 /* Ignore any prefix, eg. some architectures prepend _ */
 static inline int sym_is(const char *symbol, const char *name)
 {
@@ -839,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;
        }
@@ -943,6 +988,18 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
                do_table(symval, sym->st_size,
                         sizeof(struct platform_device_id), "platform",
                         do_platform_entry, mod);
+        else if (sym_is(symname, "__mod_mdio_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct mdio_device_id), "mdio",
+                         do_mdio_entry, mod);
+        else if (sym_is(symname, "__mod_zorro_device_table"))
+                do_table(symval, sym->st_size,
+                         sizeof(struct zorro_device_id), "zorro",
+                         do_zorro_entry, mod);
+        else if (sym_is(symname, "__mod_isapnp_device_table"))
+                do_table(symval, sym->st_size,
+                        sizeof(struct isapnp_device_id), "isa",
+                        do_isapnp_entry, mod);
        free(zeros);
 }
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index 20923613467c..7acbdd8fcaed 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;
 }
@@ -503,6 +551,11 @@ static int ignore_undef_symbol(struct elf_info *info, const char *symname)
                    strncmp(symname, "_rest32gpr_", sizeof("_rest32gpr_") - 1) == 0 ||
                    strncmp(symname, "_save32gpr_", sizeof("_save32gpr_") - 1) == 0)
                        return 1;
+        if (info->hdr->e_machine == EM_PPC64)
+                /* Special register function linked on all modules during final link of .ko */
+                if (strncmp(symname, "_restgpr0_", sizeof("_restgpr0_") - 1) == 0 ||
+                    strncmp(symname, "_savegpr0_", sizeof("_savegpr0_") - 1) == 0)
+                        return 1;
        /* Do not ignore this symbol */
        return 0;
 }
@@ -514,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:
@@ -656,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
@@ -781,10 +834,13 @@ static void check_section(const char *modname, struct elf_info *elf,
 #define ALL_EXIT_TEXT_SECTIONS \
        ".exit.text$", ".devexit.text$", ".cpuexit.text$", ".memexit.text$"
-#define ALL_INIT_SECTIONS INIT_SECTIONS, DEV_INIT_SECTIONS, \
+#define ALL_XXXINIT_SECTIONS DEV_INIT_SECTIONS, CPU_INIT_SECTIONS, \
-        CPU_INIT_SECTIONS, MEM_INIT_SECTIONS
+        MEM_INIT_SECTIONS
-#define ALL_EXIT_SECTIONS EXIT_SECTIONS, DEV_EXIT_SECTIONS, \
+#define ALL_XXXEXIT_SECTIONS DEV_EXIT_SECTIONS, CPU_EXIT_SECTIONS, \
-        CPU_EXIT_SECTIONS, MEM_EXIT_SECTIONS
+        MEM_EXIT_SECTIONS
+#define ALL_INIT_SECTIONS INIT_SECTIONS, ALL_XXXINIT_SECTIONS
+#define ALL_EXIT_SECTIONS EXIT_SECTIONS, ALL_XXXEXIT_SECTIONS
 #define DATA_SECTIONS ".data$", ".data.rel$"
 #define TEXT_SECTIONS ".text$"
@@ -814,33 +870,29 @@ static const char *data_sections[] = { DATA_SECTIONS, NULL };
 /* symbols in .data that may refer to init/exit sections */
-static const char *symbol_white_list[] =
+#define DEFAULT_SYMBOL_WHITE_LIST                                       \
-{
+        "*driver",                                                      \
-        "*driver",
+        "*_template", /* scsi uses *_template a lot */                  \
-        "*_template", /* scsi uses *_template a lot */
+        "*_timer",    /* arm uses ops structures named _timer a lot */  \
-        "*_timer",    /* arm uses ops structures named _timer a lot */
+        "*_sht",      /* scsi also used *_sht to some extent */         \
-        "*_sht",      /* scsi also used *_sht to some extent */
+        "*_ops",                                                        \
-        "*_ops",
+        "*_probe",                                                      \
-        "*_probe",
+        "*_probe_one",                                                  \
-        "*_probe_one",
+        "*_console"
-        "*_console",
-        NULL
-};
 static const char *head_sections[] = { ".head.text*", NULL };
 static const char *linker_symbols[] =
        { "__init_begin", "_sinittext", "_einittext", NULL };
 enum mismatch {
-        NO_MISMATCH,
+        TEXT_TO_ANY_INIT,
-        TEXT_TO_INIT,
+        DATA_TO_ANY_INIT,
-        DATA_TO_INIT,
+        TEXT_TO_ANY_EXIT,
-        TEXT_TO_EXIT,
+        DATA_TO_ANY_EXIT,
-        DATA_TO_EXIT,
+        XXXINIT_TO_SOME_INIT,
-        XXXINIT_TO_INIT,
+        XXXEXIT_TO_SOME_EXIT,
-        XXXEXIT_TO_EXIT,
+        ANY_INIT_TO_ANY_EXIT,
-        INIT_TO_EXIT,
+        ANY_EXIT_TO_ANY_INIT,
-        EXIT_TO_INIT,
        EXPORT_TO_INIT_EXIT,
 };
@@ -848,6 +900,7 @@ struct sectioncheck {
        const char *fromsec[20];
        const char *tosec[20];
        enum mismatch mismatch;
+        const char *symbol_white_list[20];
 };
 const struct sectioncheck sectioncheck[] = {
@@ -857,80 +910,103 @@ const struct sectioncheck sectioncheck[] = {
 {
        .fromsec = { TEXT_SECTIONS, NULL },
        .tosec   = { ALL_INIT_SECTIONS, NULL },
-        .mismatch = TEXT_TO_INIT,
+        .mismatch = TEXT_TO_ANY_INIT,
+        .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
 },
 {
        .fromsec = { DATA_SECTIONS, NULL },
-        .tosec   = { ALL_INIT_SECTIONS, NULL },
+        .tosec   = { ALL_XXXINIT_SECTIONS, NULL },
-        .mismatch = DATA_TO_INIT,
+        .mismatch = DATA_TO_ANY_INIT,
+        .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
+},
+{
+        .fromsec = { DATA_SECTIONS, NULL },
+        .tosec   = { INIT_SECTIONS, NULL },
+        .mismatch = DATA_TO_ANY_INIT,
+        .symbol_white_list = {
+                "*_template", "*_timer", "*_sht", "*_ops",
+                "*_probe", "*_probe_one", "*_console", NULL
+        },
 },
 {
        .fromsec = { TEXT_SECTIONS, NULL },
        .tosec   = { ALL_EXIT_SECTIONS, NULL },
-        .mismatch = TEXT_TO_EXIT,
+        .mismatch = TEXT_TO_ANY_EXIT,
+        .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
 },
 {
        .fromsec = { DATA_SECTIONS, NULL },
        .tosec   = { ALL_EXIT_SECTIONS, NULL },
-        .mismatch = DATA_TO_EXIT,
+        .mismatch = DATA_TO_ANY_EXIT,
+        .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
 },
 /* Do not reference init code/data from devinit/cpuinit/meminit code/data */
 {
-        .fromsec = { DEV_INIT_SECTIONS, CPU_INIT_SECTIONS, MEM_INIT_SECTIONS, NULL },
+        .fromsec = { ALL_XXXINIT_SECTIONS, NULL },
        .tosec   = { INIT_SECTIONS, NULL },
-        .mismatch = XXXINIT_TO_INIT,
+        .mismatch = XXXINIT_TO_SOME_INIT,
+        .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
 },
 /* Do not reference cpuinit code/data from meminit code/data */
 {
        .fromsec = { MEM_INIT_SECTIONS, NULL },
        .tosec   = { CPU_INIT_SECTIONS, NULL },
-        .mismatch = XXXINIT_TO_INIT,
+        .mismatch = XXXINIT_TO_SOME_INIT,
+        .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
 },
 /* Do not reference meminit code/data from cpuinit code/data */
 {
        .fromsec = { CPU_INIT_SECTIONS, NULL },
        .tosec   = { MEM_INIT_SECTIONS, NULL },
-        .mismatch = XXXINIT_TO_INIT,
+        .mismatch = XXXINIT_TO_SOME_INIT,
+        .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
 },
 /* Do not reference exit code/data from devexit/cpuexit/memexit code/data */
 {
-        .fromsec = { DEV_EXIT_SECTIONS, CPU_EXIT_SECTIONS, MEM_EXIT_SECTIONS, NULL },
+        .fromsec = { ALL_XXXEXIT_SECTIONS, NULL },
        .tosec   = { EXIT_SECTIONS, NULL },
-        .mismatch = XXXEXIT_TO_EXIT,
+        .mismatch = XXXEXIT_TO_SOME_EXIT,
+        .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
 },
 /* Do not reference cpuexit code/data from memexit code/data */
 {
        .fromsec = { MEM_EXIT_SECTIONS, NULL },
        .tosec   = { CPU_EXIT_SECTIONS, NULL },
-        .mismatch = XXXEXIT_TO_EXIT,
+        .mismatch = XXXEXIT_TO_SOME_EXIT,
+        .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
 },
 /* Do not reference memexit code/data from cpuexit code/data */
 {
        .fromsec = { CPU_EXIT_SECTIONS, NULL },
        .tosec   = { MEM_EXIT_SECTIONS, NULL },
-        .mismatch = XXXEXIT_TO_EXIT,
+        .mismatch = XXXEXIT_TO_SOME_EXIT,
+        .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
 },
 /* Do not use exit code/data from init code */
 {
        .fromsec = { ALL_INIT_SECTIONS, NULL },
        .tosec   = { ALL_EXIT_SECTIONS, NULL },
-        .mismatch = INIT_TO_EXIT,
+        .mismatch = ANY_INIT_TO_ANY_EXIT,
+        .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
 },
 /* Do not use init code/data from exit code */
 {
        .fromsec = { ALL_EXIT_SECTIONS, NULL },
        .tosec   = { ALL_INIT_SECTIONS, NULL },
-        .mismatch = EXIT_TO_INIT,
+        .mismatch = ANY_EXIT_TO_ANY_INIT,
+        .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
 },
 /* Do not export init/exit functions or data */
 {
        .fromsec = { "__ksymtab*", NULL },
        .tosec   = { INIT_SECTIONS, EXIT_SECTIONS, NULL },
-        .mismatch = EXPORT_TO_INIT_EXIT
+        .mismatch = EXPORT_TO_INIT_EXIT,
+        .symbol_white_list = { DEFAULT_SYMBOL_WHITE_LIST, NULL },
 }
 };
-static int section_mismatch(const char *fromsec, const char *tosec)
+static const struct sectioncheck *section_mismatch(
+                const char *fromsec, const char *tosec)
 {
        int i;
        int elems = sizeof(sectioncheck) / sizeof(struct sectioncheck);
@@ -939,10 +1015,10 @@ static int section_mismatch(const char *fromsec, const char *tosec)
        for (i = 0; i < elems; i++) {
                if (match(fromsec, check->fromsec) &&
                    match(tosec, check->tosec))
-                        return check->mismatch;
+                        return check;
                check++;
        }
-        return NO_MISMATCH;
+        return NULL;
 }
 /**
@@ -961,7 +1037,7 @@ static int section_mismatch(const char *fromsec, const char *tosec)
 * Pattern 2:
 *   Many drivers utilise a *driver container with references to
 *   add, remove, probe functions etc.
- *   These functions may often be marked __init and we do not want to
+ *   These functions may often be marked __devinit and we do not want to
 *   warn here.
 *   the pattern is identified by:
 *   tosec   = init or exit section
@@ -982,7 +1058,8 @@ static int section_mismatch(const char *fromsec, const char *tosec)
 *   refsymname = __init_begin, _sinittext, _einittext
 *
 **/
-static int secref_whitelist(const char *fromsec, const char *fromsym,
+static int secref_whitelist(const struct sectioncheck *mismatch,
+                            const char *fromsec, const char *fromsym,
                            const char *tosec, const char *tosym)
 {
        /* Check for pattern 1 */
@@ -994,7 +1071,7 @@ static int secref_whitelist(const char *fromsec, const char *fromsym,
        /* Check for pattern 2 */
        if (match(tosec, init_exit_sections) &&
            match(fromsec, data_sections) &&
-            match(fromsym, symbol_white_list))
+            match(fromsym, mismatch->symbol_white_list))
                return 0;
        /* Check for pattern 3 */
@@ -1023,11 +1100,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;
@@ -1089,9 +1169,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))
@@ -1138,7 +1218,7 @@ static char *sec2annotation(const char *s)
                        strcat(p, " ");
                return r; /* we leak her but we do not care */
        } else {
-                return "";
+                return strdup("");
        }
 }
@@ -1155,7 +1235,8 @@ static int is_function(Elf_Sym *sym)
 * Try to find symbols near it so user can find it.
 * Check whitelist before warning - it may be a false positive.
 */
-static void report_sec_mismatch(const char *modname, enum mismatch mismatch,
+static void report_sec_mismatch(const char *modname,
+                                const struct sectioncheck *mismatch,
                                const char *fromsec,
                                unsigned long long fromaddr,
                                const char *fromsym,
@@ -1165,6 +1246,8 @@ static void report_sec_mismatch(const char *modname, enum mismatch mismatch,
 {
        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;
@@ -1186,64 +1269,80 @@ static void report_sec_mismatch(const char *modname, enum mismatch mismatch,
             modname, fromsec, fromaddr, from, fromsym, from_p, to, tosec,
             tosym, to_p);
-        switch (mismatch) {
+        switch (mismatch->mismatch) {
-        case TEXT_TO_INIT:
+        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_INIT: {
+        case DATA_TO_ANY_INIT: {
-                const char **s = symbol_white_list;
+                prl_to = sec2annotation(tosec);
+                const char *const *s = mismatch->symbol_white_list;
                fprintf(stderr,
                "The variable %s references\n"
                "the %s %s%s%s\n"
                "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_EXIT:
+        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_EXIT: {
+        case DATA_TO_ANY_EXIT: {
-                const char **s = symbol_white_list;
+                prl_to = sec2annotation(tosec);
+                const char *const *s = mismatch->symbol_white_list;
                fprintf(stderr,
                "The variable %s references\n"
                "the %s %s%s%s\n"
                "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_INIT:
+        case XXXINIT_TO_SOME_INIT:
-        case XXXEXIT_TO_EXIT:
+        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 INIT_TO_EXIT:
+        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"
@@ -1252,11 +1351,15 @@ static void report_sec_mismatch(const char *modname, enum mismatch mismatch,
                "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 EXIT_TO_INIT:
+        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"
@@ -1265,18 +1368,20 @@ static void report_sec_mismatch(const char *modname, enum mismatch mismatch,
                "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);
-        case NO_MISMATCH:
+                free(prl_to);
-                /* To get warnings on missing members */
                break;
        }
        fprintf(stderr, "\n");
@@ -1286,11 +1391,11 @@ static void check_section_mismatch(const char *modname, struct elf_info *elf,
                                   Elf_Rela *r, Elf_Sym *sym, const char *fromsec)
 {
        const char *tosec;
-        enum mismatch mismatch;
+        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 != NO_MISMATCH) {
+        if (mismatch) {
                Elf_Sym *to;
                Elf_Sym *from;
                const char *tosym;
@@ -1302,7 +1407,8 @@ static void check_section_mismatch(const char *modname, struct elf_info *elf,
                tosym = sym_name(elf, to);
                /* check whitelist - we may ignore it */
-                if (secref_whitelist(fromsec, fromsym, tosec, tosym)) {
+                if (secref_whitelist(mismatch,
+                                        fromsec, fromsym, tosec, tosym)) {
                        report_sec_mismatch(modname, mismatch,
                           fromsec, r->r_offset, fromsym,
                           is_function(from), tosec, tosym,
@@ -1315,10 +1421,10 @@ 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);
+                r->r_offset - sechdrs[section].sh_addr;
 }
 static int addend_386_rel(struct elf_info *elf, Elf_Shdr *sechdr, Elf_Rela *r)
@@ -1423,7 +1529,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);
        }
@@ -1481,7 +1587,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);
        }
@@ -1506,7 +1612,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/namespace.pl b/scripts/namespace.pl
index c6e88c652c2f..361d0f71184b 100755
--- a/scripts/namespace.pl
+++ b/scripts/namespace.pl
@@ -175,12 +175,11 @@ sub do_nm
        }
        if (! -e "$source.c" && ! -e "$source.S") {
                # No obvious source, exclude the object if it is conglomerate
-                if (! open(OBJDUMPDATA, "$objdump $basename|")) {
+                open(my $objdumpdata, "$objdump $basename|")
-                        printf STDERR "$objdump $fullname failed $!\n";
+                    or die "$objdump $fullname failed $!\n";
-                        return;
-                }
                my $comment;
-                while (<OBJDUMPDATA>) {
+                while (<$objdumpdata>) {
                        chomp();
                        if (/^In archive/) {
                                # Archives are always conglomerate
@@ -190,18 +189,18 @@ sub do_nm
                        next if (! /^[ 0-9a-f]{5,} /);
                        $comment .= substr($_, 43);
                }
-                close(OBJDUMPDATA);
+                close($objdumpdata);
                if (!defined($comment) || $comment !~ /GCC\:.*GCC\:/m) {
                        printf STDERR "No source file found for $fullname\n";
                }
                return;
        }
-        if (! open(NMDATA, "$nm $basename|")) {
+        open (my $nmdata, "$nm $basename|")
-                printf STDERR "$nm $fullname failed $!\n";
+            or die "$nm $fullname failed $!\n";
-                return;
-        }
        my @nmdata;
-        while (<NMDATA>) {
+        while (<$nmdata>) {
                chop;
                ($type, $name) = (split(/ +/, $_, 3))[1..2];
                # Expected types
@@ -268,7 +267,8 @@ sub do_nm
                        }
                }
        }
-        close(NMDATA);
+        close($nmdata);
        if ($#nmdata < 0) {
                if (
                        $fullname ne "lib/brlock.o"
@@ -316,8 +316,7 @@ sub drop_def
 sub list_multiply_defined
 {
-        my ($name, $module);
+        foreach my $name (keys(%def)) {
-        foreach $name (keys(%def)) {
                if ($#{$def{$name}} > 0) {
                        # Special case for cond_syscall
                        if ($#{$def{$name}} == 1 && $name =~ /^sys_/ &&
@@ -333,8 +332,9 @@ sub list_multiply_defined
                                &drop_def("arch/x86/kernel/vsyscall-sysenter_32.o", $name);
                                next;
                        }
                        printf "$name is multiply defined in :-\n";
-                        foreach $module (@{$def{$name}}) {
+                        foreach my $module (@{$def{$name}}) {
                                printf "\t$module\n";
                        }
                }
@@ -343,12 +343,13 @@ sub list_multiply_defined
 sub resolve_external_references
 {
-        my ($object, $type, $name, $i, $j, $kstrtab, $ksymtab, $export);
+        my ($kstrtab, $ksymtab, $export);
        printf "\n";
-        foreach $object (keys(%nmdata)) {
+        foreach my $object (keys(%nmdata)) {
                my $nmdata = $nmdata{$object};
-                for ($i = 0; $i <= $#{$nmdata}; ++$i) {
+                for (my $i = 0; $i <= $#{$nmdata}; ++$i) {
-                        ($type, $name) = split(' ', $nmdata->[$i], 2);
+                        my ($type, $name) = split(' ', $nmdata->[$i], 2);
                        if ($type eq "U" || $type eq "w") {
                                if (exists($def{$name}) || exists($ksymtab{$name})) {
                                        # add the owning object to the nmdata
@@ -357,7 +358,7 @@ sub resolve_external_references
                                        $kstrtab = "R __kstrtab_$name";
                                        $ksymtab = "R __ksymtab_$name";
                                        $export = 0;
-                                        for ($j = 0; $j <= $#{$nmdata}; ++$j) {
+                                        for (my $j = 0; $j <= $#{$nmdata}; ++$j) {
                                                if ($nmdata->[$j] eq $kstrtab ||
                                                    $nmdata->[$j] eq $ksymtab) {
                                                        $export = 1;
@@ -424,11 +425,11 @@ sub resolve_external_references
 sub list_extra_externals
 {
        my %noref = ();
-        my ($name, @module, $module, $export);
-        foreach $name (keys(%def)) {
+        foreach my $name (keys(%def)) {
                if (! exists($ref{$name})) {
-                        @module = @{$def{$name}};
+                        my @module = @{$def{$name}};
-                        foreach $module (@module) {
+                        foreach my $module (@module) {
                                if (! exists($noref{$module})) {
                                        $noref{$module} = [];
                                }
@@ -438,16 +439,16 @@ sub list_extra_externals
        }
        if (%noref) {
                printf "\nExternally defined symbols with no external references\n";
-                foreach $module (sort(keys(%noref))) {
+                foreach my $module (sort(keys(%noref))) {
                        printf "  $module\n";
                        foreach (sort(@{$noref{$module}})) {
-                                if (exists($export{$_})) {
+                            my $export;
-                                        $export = " (export only)";
+                            if (exists($export{$_})) {
-                                }
+                                $export = " (export only)";
-                                else {
+                            } else {
-                                        $export = "";
+                                $export = "";
-                                }
+                            }
-                                printf "    $_$export\n";
+                            printf "    $_$export\n";
                        }
                }
        }
diff --git a/scripts/package/Makefile b/scripts/package/Makefile
index 62fcc3a7f4d3..d0b931b994fc 100644
--- a/scripts/package/Makefile
+++ b/scripts/package/Makefile
@@ -44,7 +44,7 @@ rpm-pkg rpm: $(objtree)/kernel.spec FORCE
        fi
        $(MAKE) clean
        $(PREV) ln -sf $(srctree) $(KERNELPATH)
-        $(CONFIG_SHELL) $(srctree)/scripts/setlocalversion > $(objtree)/.scmversion
+        $(CONFIG_SHELL) $(srctree)/scripts/setlocalversion --save-scmversion
        $(PREV) tar -cz $(RCS_TAR_IGNORE) -f $(KERNELPATH).tar.gz $(KERNELPATH)/.
        $(PREV) rm $(KERNELPATH)
        rm -f $(objtree)/.scmversion
@@ -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 8b357b0bd250..5f1e2fc7f171 100644
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -18,6 +18,8 @@ create_package() {
        cp debian/copyright "$pdir/usr/share/doc/$pname/"
        cp debian/changelog "$pdir/usr/share/doc/$pname/changelog.Debian"
        gzip -9 "$pdir/usr/share/doc/$pname/changelog.Debian"
+        sh -c "cd '$pdir'; find . -type f ! -path './DEBIAN/*' -printf '%P\0' \
+                | xargs -r0 md5sum > DEBIAN/md5sums"
        # Fix ownership and permissions
        chown -R root:root "$pdir"
@@ -146,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/package/mkspec b/scripts/package/mkspec
index 47bdd2f99b78..15440f55aef6 100755
--- a/scripts/package/mkspec
+++ b/scripts/package/mkspec
@@ -1,6 +1,6 @@
 #!/bin/sh
 #
-#       Output a simple RPM spec file that uses no fancy features requring
+#       Output a simple RPM spec file that uses no fancy features requiring
 #       RPM v4. This is intended to work with any RPM distro.
 #
 #       The only gothic bit here is redefining install_post to avoid
@@ -39,7 +39,7 @@ if ! $PREBUILT; then
 echo "Source: kernel-$__KERNELRELEASE.tar.gz"
 fi
-echo "BuildRoot: /var/tmp/%{name}-%{PACKAGE_VERSION}-root"
+echo "BuildRoot: %{_tmppath}/%{name}-%{PACKAGE_VERSION}-root"
 echo "Provides: $PROVIDES"
 echo "%define __spec_install_post /usr/lib/rpm/brp-compress || :"
 echo "%define debug_package %{nil}"
diff --git a/scripts/profile2linkerlist.pl b/scripts/profile2linkerlist.pl
index cb4260ebdb91..6943fa7cc95b 100644
--- a/scripts/profile2linkerlist.pl
+++ b/scripts/profile2linkerlist.pl
@@ -7,15 +7,13 @@
 # usage:
 #        readprofile | sort -rn | perl profile2linkerlist.pl > functionlist
 #
+use strict;
 while (<>) {
  my $line = $_;
  $_ =~ /\W*[0-9]+\W*([a-zA-Z\_0-9]+)\W*[0-9]+/;
-  if ( ($line =~ /unknown/) || ($line =~ /total/)) {
+  print "*(.text.$1)\n"
+      unless ($line =~ /unknown/) || ($line =~ /total/);
-  } else {
-    print "*(.text.$1)\n";
-  }
 }
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/rt-tester/rt-tester.py b/scripts/rt-tester/rt-tester.py
index 4c79660793cf..44423b4dcb82 100644
--- a/scripts/rt-tester/rt-tester.py
+++ b/scripts/rt-tester/rt-tester.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 #
 # rt-mutex tester
 #
diff --git a/scripts/selinux/genheaders/genheaders.c b/scripts/selinux/genheaders/genheaders.c
index 24626968055d..58a12c278706 100644
--- a/scripts/selinux/genheaders/genheaders.c
+++ b/scripts/selinux/genheaders/genheaders.c
@@ -81,7 +81,7 @@ int main(int argc, char *argv[])
        fprintf(fout, "\n");
        for (i = 1; i < isids_len; i++) {
-                char *s = initial_sid_to_string[i];
+                const char *s = initial_sid_to_string[i];
                fprintf(fout, "#define SECINITSID_%s", s);
                for (j = 0; j < max(1, 40 - strlen(s)); j++)
                        fprintf(fout, " ");
diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index 46989b88d734..64a9cb5556cd 100755
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -10,73 +10,162 @@
 #
 usage() {
-        echo "Usage: $0 [srctree]" >&2
+        echo "Usage: $0 [--save-scmversion] [srctree]" >&2
        exit 1
 }
-cd "${1:-.}" || usage
+scm_only=false
+srctree=.
+if test "$1" = "--save-scmversion"; then
+        scm_only=true
+        shift
+fi
+if test $# -gt 0; then
+        srctree=$1
+        shift
+fi
+if test $# -gt 0 -o ! -d "$srctree"; then
+        usage
+fi
-# Check for git and a git repo.
+scm_version()
-if head=`git rev-parse --verify --short HEAD 2>/dev/null`; then
+{
+        local short
+        short=false
-        # If we are at a tagged commit (like "v2.6.30-rc6"), we ignore it,
+        cd "$srctree"
-        # because this version is defined in the top level Makefile.
+        if test -e .scmversion; then
-        if [ -z "`git describe --exact-match 2>/dev/null`" ]; then
+                cat .scmversion
+                return
+        fi
+        if test "$1" = "--short"; then
+                short=true
+        fi
-                # If we are past a tagged commit (like "v2.6.30-rc5-302-g72357d5"),
+        # Check for git and a git repo.
-                # we pretty print it.
+        if head=`git rev-parse --verify --short HEAD 2>/dev/null`; then
-                if atag="`git describe 2>/dev/null`"; then
-                        echo "$atag" | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}'
+                # 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.
+                if [ -z "`git describe --exact-match 2>/dev/null`" ]; then
+                        # If only the short version is requested, don't bother
+                        # running further git commands
+                        if $short; then
+                                echo "+"
+                                return
+                        fi
+                        # If we are past a tagged commit (like
+                        # "v2.6.30-rc5-302-g72357d5"), we pretty print it.
+                        if atag="`git describe 2>/dev/null`"; then
+                                echo "$atag" | awk -F- '{printf("-%05d-%s", $(NF-1),$(NF))}'
+                        # If we don't have a tag at all we print -g{commitish}.
+                        else
+                                printf '%s%s' -g $head
+                        fi
+                fi
-                # If we don't have a tag at all we print -g{commitish}.
+                # Is this git on svn?
-                else
+                if git config --get svn-remote.svn.url >/dev/null; then
-                        printf '%s%s' -g $head
+                        printf -- '-svn%s' "`git svn find-rev $head`"
                fi
-        fi
-        # Is this git on svn?
+                # Update index only on r/w media
-        if git config --get svn-remote.svn.url >/dev/null; then
+                [ -w . ] && git update-index --refresh --unmerged > /dev/null
-                printf -- '-svn%s' "`git svn find-rev $head`"
-        fi
-        # Update index only on r/w media
+                # Check for uncommitted changes
-        [ -w . ] && git update-index --refresh --unmerged > /dev/null
+                if git diff-index --name-only HEAD | grep -v "^scripts/package" \
+                    | read dummy; then
+                        printf '%s' -dirty
+                fi
-        # Check for uncommitted changes
+                # All done with git
-        if git diff-index --name-only HEAD | grep -v "^scripts/package" \
+                return
-            | read dummy; then
-                printf '%s' -dirty
        fi
-        # All done with git
+        # Check for mercurial and a mercurial repo.
-        exit
+        if hgid=`hg id 2>/dev/null`; then
-fi
+                tag=`printf '%s' "$hgid" | cut -d' ' -f2`
-# Check for mercurial and a mercurial repo.
+                # Do we have an untagged version?
-if hgid=`hg id 2>/dev/null`; then
+                if [ -z "$tag" -o "$tag" = tip ]; then
-        tag=`printf '%s' "$hgid" | cut -d' ' -f2`
+                        id=`printf '%s' "$hgid" | sed 's/[+ ].*//'`
+                        printf '%s%s' -hg "$id"
+                fi
+                # Are there uncommitted changes?
+                # These are represented by + after the changeset id.
+                case "$hgid" in
+                        *+|*+\ *) printf '%s' -dirty ;;
+                esac
-        # Do we have an untagged version?
+                # All done with mercurial
-        if [ -z "$tag" -o "$tag" = tip ]; then
+                return
-                id=`printf '%s' "$hgid" | sed 's/[+ ].*//'`
-                printf '%s%s' -hg "$id"
        fi
-        # Are there uncommitted changes?
+        # Check for svn and a svn repo.
-        # These are represented by + after the changeset id.
+        if rev=`svn info 2>/dev/null | grep '^Last Changed Rev'`; then
-        case "$hgid" in
+                rev=`echo $rev | awk '{print $NF}'`
-                *+|*+\ *) printf '%s' -dirty ;;
+                printf -- '-svn%s' "$rev"
-        esac
-        # All done with mercurial
+                # All done with svn
+                return
+        fi
+}
+collect_files()
+{
+        local file res
+        for file; do
+                case "$file" in
+                *\~*)
+                        continue
+                        ;;
+                esac
+                if test -e "$file"; then
+                        res="$res$(cat "$file")"
+                fi
+        done
+        echo "$res"
+}
+if $scm_only; then
+        if test ! -e .scmversion; then
+                res=$(scm_version)
+                echo "$res" >.scmversion
+        fi
        exit
 fi
-# Check for svn and a svn repo.
+if test -e include/config/auto.conf; then
-if rev=`svn info 2>/dev/null | grep '^Last Changed Rev'`; then
+        . include/config/auto.conf
-        rev=`echo $rev | awk '{print $NF}'`
+else
-        printf -- '-svn%s' "$rev"
+        echo "Error: kernelrelease not valid - run 'make prepare' to update it"
+        exit 1
+fi
-        # All done with svn
+# localversion* files in the build and source directory
-        exit
+res="$(collect_files localversion*)"
+if test ! "$srctree" -ef .; then
+        res="$res$(collect_files "$srctree"/localversion*)"
+fi
+# CONFIG_LOCALVERSION and LOCALVERSION (if set)
+res="${res}${CONFIG_LOCALVERSION}${LOCALVERSION}"
+# scm version string if not at a tagged commit
+if test "$CONFIG_LOCALVERSION_AUTO" = "y"; then
+        # full scm version string
+        res="$res$(scm_version)"
+else
+        # apped a plus sign if the repository is not in a clean tagged
+        # state and  LOCALVERSION= is not specified
+        if test "${LOCALVERSION+set}" != "set"; then
+                scm=$(scm_version --short)
+                res="$res${scm:++}"
+        fi
 fi
+echo "$res"
diff --git a/scripts/show_delta b/scripts/show_delta
index 48a706ab3d0c..17df3051747a 100755
--- a/scripts/show_delta
+++ b/scripts/show_delta
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 #
 # show_deltas: Read list of printk messages instrumented with
 # time data, and format with time deltas.
diff --git a/scripts/tags.sh b/scripts/tags.sh
index 1a0c44d7c4a7..8509bb512935 100755
--- a/scripts/tags.sh
+++ b/scripts/tags.sh
@@ -5,7 +5,7 @@
 # mode may be any of: tags, TAGS, cscope
 #
 # Uses the following environment variables:
-# ARCH, SUBARCH, srctree, src, obj
+# ARCH, SUBARCH, SRCARCH, srctree, src, obj
 if [ "$KBUILD_VERBOSE" = "1" ]; then
        set -x
@@ -17,28 +17,48 @@ ignore="( -name SCCS -o -name BitKeeper -o -name .svn -o \
          -name .git )                                   \
          -prune -o"
-# Do not use full path is we do not use O=.. builds
+# Do not use full path if we do not use O=.. builds
+# Use make O=. {tags|cscope}
+# to force full paths for a non-O= build
 if [ "${KBUILD_SRC}" = "" ]; then
        tree=
 else
        tree=${srctree}/
 fi
+# Find all available archs
+find_all_archs()
+{
+        ALLSOURCE_ARCHS=""
+        for arch in `ls ${tree}arch`; do
+                ALLSOURCE_ARCHS="${ALLSOURCE_ARCHS} "${arch##\/}
+        done
+}
 # Detect if ALLSOURCE_ARCHS is set. If not, we assume SRCARCH
 if [ "${ALLSOURCE_ARCHS}" = "" ]; then
        ALLSOURCE_ARCHS=${SRCARCH}
+elif [ "${ALLSOURCE_ARCHS}" = "all" ]; then
+        find_all_archs
 fi
 # find sources in arch/$ARCH
 find_arch_sources()
 {
-        find ${tree}arch/$1 $ignore -name "$2" -print;
+        for i in $archincludedir; do
+                prune="$prune -wholename $i -prune -o"
+        done
+        find ${tree}arch/$1 $ignore $prune -name "$2" -print;
 }
 # find sources in arch/$1/include
 find_arch_include_sources()
 {
-        find ${tree}arch/$1/include $ignore -name "$2" -print;
+        include=$(find ${tree}arch/$1/ -name include -type d);
+        if [ -n "$include" ]; then
+                archincludedir="$archincludedir $include"
+                find $include $ignore -name "$2" -print;
+        fi
 }
 # find sources in include/
@@ -63,14 +83,15 @@ find_sources()
 all_sources()
 {
-        for arch in $ALLSOURCE_ARCHS
+        find_arch_include_sources ${SRCARCH} '*.[chS]'
-        do
-                find_sources $arch '*.[chS]'
-        done
        if [ ! -z "$archinclude" ]; then
                find_arch_include_sources $archinclude '*.[chS]'
        fi
        find_include_sources '*.[chS]'
+        for arch in $ALLSOURCE_ARCHS
+        do
+                find_sources $arch '*.[chS]'
+        done
        find_other_sources '*.[chS]'
 }
@@ -89,13 +110,7 @@ all_defconfigs()
 docscope()
 {
-        # always use absolute paths for cscope, as recommended by cscope
+        (echo \-k; echo \-q; all_sources) > cscope.files
-        # upstream
-        case "$tree" in
-                /*) ;;
-                *) tree=$PWD/$tree ;;
-        esac
-        (cd /; echo \-k; echo \-q; all_sources) > cscope.files
        cscope -b -f cscope.out
 }