Merge branch 'master' into for-linus

34 files changed, 1515 insertions, 348 deletions

diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index e4deb73e9a84..a1a5cf95a68d 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -115,7 +115,10 @@ endif
 # ---------------------------------------------------------------------------
 
 # Default is built-in, unless we know otherwise
-modkern_cflags = $(if $(part-of-module), $(CFLAGS_MODULE), $(CFLAGS_KERNEL))
+modkern_cflags =                                          \
+        $(if $(part-of-module),                           \
+                $(KBUILD_CFLAGS_MODULE) $(CFLAGS_MODULE), \
+                $(KBUILD_CFLAGS_KERNEL) $(CFLAGS_KERNEL))
 quiet_modtag := $(empty)   $(empty)
 
 $(real-objs-m)        : part-of-module := y
@@ -156,14 +159,14 @@ $(obj)/%.i: $(src)/%.c FORCE
 
 cmd_gensymtypes =                                                           \
     $(CPP) -D__GENKSYMS__ $(c_flags) $< |                                   \
-    $(GENKSYMS) -T $@ -a $(ARCH)                                            \
+    $(GENKSYMS) $(if $(1), -T $(2)) -a $(ARCH)                              \
      $(if $(KBUILD_PRESERVE),-p)                                            \
-     $(if $(1),-r $(firstword $(wildcard $(@:.symtypes=.symref) /dev/null)))
+     -r $(firstword $(wildcard $(2:.symtypes=.symref) /dev/null))
 
 quiet_cmd_cc_symtypes_c = SYM $(quiet_modtag) $@
 cmd_cc_symtypes_c =                                                         \
     set -e;                                                                 \
-    $(call cmd_gensymtypes, true) >/dev/null;                               \
+    $(call cmd_gensymtypes,true,$@) >/dev/null;                             \
     test -s $@ || rm -f $@
 
 $(obj)/%.symtypes : $(src)/%.c FORCE
@@ -192,16 +195,16 @@ else
 #   the actual value of the checksum generated by genksyms
 
 cmd_cc_o_c = $(CC) $(c_flags) -c -o $(@D)/.tmp_$(@F) $<
-cmd_modversions =                                                       \
-        if $(OBJDUMP) -h $(@D)/.tmp_$(@F) | grep -q __ksymtab; then     \
-                $(call cmd_gensymtypes, $(KBUILD_SYMTYPES))             \
-                    > $(@D)/.tmp_$(@F:.o=.ver);                         \
-                                                                        \
-                $(LD) $(LDFLAGS) -r -o $@ $(@D)/.tmp_$(@F)              \
-                        -T $(@D)/.tmp_$(@F:.o=.ver);                    \
-                rm -f $(@D)/.tmp_$(@F) $(@D)/.tmp_$(@F:.o=.ver);        \
-        else                                                            \
-                mv -f $(@D)/.tmp_$(@F) $@;                              \
+cmd_modversions =                                                               \
+        if $(OBJDUMP) -h $(@D)/.tmp_$(@F) | grep -q __ksymtab; then             \
+                $(call cmd_gensymtypes,$(KBUILD_SYMTYPES),$(@:.o=.symtypes))    \
+                    > $(@D)/.tmp_$(@F:.o=.ver);                                 \
+                                                                                \
+                $(LD) $(LDFLAGS) -r -o $@ $(@D)/.tmp_$(@F)                      \
+                        -T $(@D)/.tmp_$(@F:.o=.ver);                            \
+                rm -f $(@D)/.tmp_$(@F) $(@D)/.tmp_$(@F:.o=.ver);                \
+        else                                                                    \
+                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:.o=.s): modkern_aflags := $(AFLAGS_MODULE)
+$(real-objs-m)      : modkern_aflags := $(KBUILD_AFLAGS_MODULE) $(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.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 $@         \
-                          $(filter-out FORCE,$^)
+      cmd_ld_ko_o = $(LD) -r $(LDFLAGS)                                 \
+                             $(KBUILD_LDFLAGS_MODULE) $(LDFLAGS_MODULE) \
+                             -o $@ $(filter-out FORCE,$^)
 
 $(modules): %.ko :%.o %.mod.o FORCE
         $(call if_changed,ld_ko_o)
diff --git a/scripts/checkkconfigsymbols.sh b/scripts/checkkconfigsymbols.sh
index 46be3c5a62b7..2ca49bb31efc 100755
--- a/scripts/checkkconfigsymbols.sh
+++ b/scripts/checkkconfigsymbols.sh
@@ -14,7 +14,7 @@ find $paths -name '*.[chS]' -o -name 'Makefile' -o -name 'Makefile*[^~]'| while
 do
         # Output the bare Kconfig variable and the filename; the _MODULE part at
         # the end is not removed here (would need perl an not-hungry regexp for that).
-        sed -ne 's!^.*\<\(UML_\)\?CONFIG_\([0-9A-Z_]\+\).*!\2 '$i'!p' < $i
+        sed -ne 's!^.*\<\(UML_\)\?CONFIG_\([0-9A-Za-z_]\+\).*!\2 '$i'!p' < $i
 done | \
 # Smart "sort|uniq" implemented in awk and tuned to collect the names of all
 # files which use a given symbol
diff --git a/scripts/coccicheck b/scripts/coccicheck
new file mode 100755
index 000000000000..b8bcf1f7bed7
--- /dev/null
+++ b/scripts/coccicheck
@@ -0,0 +1,80 @@
+#!/bin/sh
+
+SPATCH="`which ${SPATCH:=spatch}`"
+
+if [ "$C" = "1" -o "$C" = "2" ]; then
+    ONLINE=1
+
+# This requires Coccinelle >= 0.2.3
+#    FLAGS="-ignore_unknown_options -very_quiet"
+#    OPTIONS=$*
+
+# Workaround for Coccinelle < 0.2.3
+    FLAGS="-I $srctree/include -very_quiet"
+    shift $(( $# - 1 ))
+    OPTIONS=$1
+else
+    ONLINE=0
+    FLAGS="-very_quiet"
+fi
+
+if [ ! -x "$SPATCH" ]; then
+    echo 'spatch is part of the Coccinelle project and is available at http://coccinelle.lip6.fr/'
+    exit 1
+fi
+
+if [ "$MODE" = "" ] ; then
+    if [ "$ONLINE" = "0" ] ; then
+        echo 'You have not explicitly specify the mode to use. Fallback to "report".'
+        echo 'You can specify the mode with "make coccicheck MODE=<mode>"'
+        echo 'Available modes are: report, patch, context, org'
+    fi
+    MODE="report"
+fi
+
+if [ "$ONLINE" = "0" ] ; then
+    echo ''
+    echo 'Please check for false positives in the output before submitting a patch.'
+    echo 'When using "patch" mode, carefully review the patch before submitting it.'
+    echo ''
+fi
+
+coccinelle () {
+    COCCI="$1"
+
+    OPT=`grep "Option" $COCCI | cut -d':' -f2`
+
+#   The option '-parse_cocci' can be used to syntaxically check the SmPL files.
+#
+#    $SPATCH -D $MODE $FLAGS -parse_cocci $COCCI $OPT > /dev/null
+
+    if [ "$ONLINE" = "0" ] ; then
+
+        FILE=`echo $COCCI | sed "s|$srctree/||"`
+
+        echo "Processing `basename $COCCI` with option(s) \"$OPT\""
+        echo 'Message example to submit a patch:'
+
+        sed -e '/\/\/\//!d' -e 's|^///||' $COCCI
+
+        echo ' The semantic patch that makes this change is available'
+        echo " in $FILE."
+        echo ''
+        echo ' More information about semantic patching is available at'
+        echo ' http://coccinelle.lip6.fr/'
+        echo ''
+
+        $SPATCH -D $MODE $FLAGS -sp_file $COCCI $OPT -dir $srctree || exit 1
+    else
+        $SPATCH -D $MODE $FLAGS -sp_file $COCCI $OPT $OPTIONS || exit 1
+    fi
+
+}
+
+if [ "$COCCI" = "" ] ; then
+    for f in `find $srctree/scripts/coccinelle/ -name '*.cocci' -type f | sort`; do
+        coccinelle $f
+    done
+else
+    coccinelle $COCCI
+fi
diff --git a/scripts/coccinelle/alloc/drop_kmalloc_cast.cocci b/scripts/coccinelle/alloc/drop_kmalloc_cast.cocci
new file mode 100644
index 000000000000..7d4771d449c3
--- /dev/null
+++ b/scripts/coccinelle/alloc/drop_kmalloc_cast.cocci
@@ -0,0 +1,67 @@
+///
+/// Casting (void *) value returned by kmalloc is useless
+/// as mentioned in Documentation/CodingStyle, Chap 14.
+///
+// Confidence: High
+// Copyright: 2009,2010 Nicolas Palix, DIKU.  GPLv2.
+// URL: http://coccinelle.lip6.fr/
+// Options: -no_includes -include_headers
+//
+// Keywords: kmalloc, kzalloc, kcalloc
+// Version min: < 2.6.12 kmalloc
+// Version min: < 2.6.12 kcalloc
+// Version min:   2.6.14 kzalloc
+//
+
+virtual context
+virtual patch
+virtual org
+virtual report
+
+//----------------------------------------------------------
+//  For context mode
+//----------------------------------------------------------
+
+@depends on context@
+type T;
+@@
+
+* (T *)
+  \(kmalloc\|kzalloc\|kcalloc\)(...)
+
+//----------------------------------------------------------
+//  For patch mode
+//----------------------------------------------------------
+
+@depends on patch@
+type T;
+@@
+
+- (T *)
+  \(kmalloc\|kzalloc\|kcalloc\)(...)
+
+//----------------------------------------------------------
+//  For org and report mode
+//----------------------------------------------------------
+
+@r depends on org || report@
+type T;
+position p;
+@@
+
+ (T@p *)\(kmalloc\|kzalloc\|kcalloc\)(...)
+
+@script:python depends on org@
+p << r.p;
+t << r.T;
+@@
+
+coccilib.org.print_safe_todo(p[0], t)
+
+@script:python depends on report@
+p << r.p;
+t << r.T;
+@@
+
+msg="WARNING: casting value returned by k[cmz]alloc to (%s *) is useless." % (t)
+coccilib.report.print_report(p[0], msg)
diff --git a/scripts/coccinelle/alloc/kzalloc-simple.cocci b/scripts/coccinelle/alloc/kzalloc-simple.cocci
new file mode 100644
index 000000000000..2eae828fc657
--- /dev/null
+++ b/scripts/coccinelle/alloc/kzalloc-simple.cocci
@@ -0,0 +1,82 @@
+///
+/// kzalloc should be used rather than kmalloc followed by memset 0
+///
+// Confidence: High
+// Copyright: (C) 2009-2010 Julia Lawall, Nicolas Palix, DIKU.  GPLv2.
+// Copyright: (C) 2009-2010 Gilles Muller, INRIA/LiP6.  GPLv2.
+// URL: http://coccinelle.lip6.fr/rules/kzalloc.html
+// Options: -no_includes -include_headers
+//
+// Keywords: kmalloc, kzalloc
+// Version min: < 2.6.12 kmalloc
+// Version min:   2.6.14 kzalloc
+//
+
+virtual context
+virtual patch
+virtual org
+virtual report
+
+//----------------------------------------------------------
+//  For context mode
+//----------------------------------------------------------
+
+@depends on context@
+type T, T2;
+expression x;
+expression E1,E2;
+statement S;
+@@
+
+* x = (T)kmalloc(E1,E2);
+  if ((x==NULL) || ...) S
+* memset((T2)x,0,E1);
+
+//----------------------------------------------------------
+//  For patch mode
+//----------------------------------------------------------
+
+@depends on patch@
+type T, T2;
+expression x;
+expression E1,E2;
+statement S;
+@@
+
+- x = (T)kmalloc(E1,E2);
++ x = kzalloc(E1,E2);
+  if ((x==NULL) || ...) S
+- memset((T2)x,0,E1);
+
+//----------------------------------------------------------
+//  For org mode
+//----------------------------------------------------------
+
+@r depends on org || report@
+type T, T2;
+expression x;
+expression E1,E2;
+statement S;
+position p;
+@@
+
+ x = (T)kmalloc@p(E1,E2);
+ if ((x==NULL) || ...) S
+ memset((T2)x,0,E1);
+
+@script:python depends on org@
+p << r.p;
+x << r.x;
+@@
+
+msg="%s" % (x)
+msg_safe=msg.replace("[","@(").replace("]",")")
+coccilib.org.print_todo(p[0], msg_safe)
+
+@script:python depends on report@
+p << r.p;
+x << r.x;
+@@
+
+msg="WARNING: kzalloc should be used for %s, instead of kmalloc/memset" % (x)
+coccilib.report.print_report(p[0], msg)
diff --git a/scripts/coccinelle/deref_null.cocci b/scripts/coccinelle/deref_null.cocci
new file mode 100644
index 000000000000..9969d76d0f4b
--- /dev/null
+++ b/scripts/coccinelle/deref_null.cocci
@@ -0,0 +1,293 @@
+///
+/// A variable is dereference under a NULL test.
+/// Even though it is know to be NULL.
+///
+// Confidence: Moderate
+// Copyright: (C) 2010 Nicolas Palix, DIKU.  GPLv2.
+// Copyright: (C) 2010 Julia Lawall, DIKU.  GPLv2.
+// Copyright: (C) 2010 Gilles Muller, INRIA/LiP6.  GPLv2.
+// URL: http://coccinelle.lip6.fr/
+// Comments: -I ... -all_includes can give more complete results
+// Options:
+
+virtual context
+virtual patch
+virtual org
+virtual report
+
+@initialize:python depends on !context && patch && !org && !report@
+
+import sys
+print >> sys.stderr, "This semantic patch does not support the 'patch' mode."
+
+@depends on patch@
+@@
+
+this_rule_should_never_matches();
+
+@ifm depends on !patch@
+expression *E;
+statement S1,S2;
+position p1;
+@@
+
+if@p1 ((E == NULL && ...) || ...) S1 else S2
+
+// The following two rules are separate, because both can match a single
+// expression in different ways
+@pr1 depends on !patch expression@
+expression *ifm.E;
+identifier f;
+position p1;
+@@
+
+ (E != NULL && ...) ? <+...E->f@p1...+> : ...
+
+@pr2 depends on !patch expression@
+expression *ifm.E;
+identifier f;
+position p2;
+@@
+
+(
+  (E != NULL) && ... && <+...E->f@p2...+>
+|
+  (E == NULL) || ... || <+...E->f@p2...+>
+|
+ sizeof(<+...E->f@p2...+>)
+)
+
+// For org and report modes
+
+@r depends on !context && !patch && (org || report) exists@
+expression subE <= ifm.E;
+expression *ifm.E;
+expression E1,E2;
+identifier f;
+statement S1,S2,S3,S4;
+iterator iter;
+position p!={pr1.p1,pr2.p2};
+position ifm.p1;
+@@
+
+if@p1 ((E == NULL && ...) || ...)
+{
+  ... when != if (...) S1 else S2
+(
+ iter(subE,...) S4 // no use
+|
+ list_remove_head(E2,subE,...)
+|
+ subE = E1
+|
+ for(subE = E1;...;...) S4
+|
+ subE++
+|
+ ++subE
+|
+ --subE
+|
+ subE--
+|
+ &subE
+|
+ E->f@p // bad use
+)
+  ... when any
+  return ...;
+}
+else S3
+
+@script:python depends on !context && !patch && !org && report@
+p << r.p;
+p1 << ifm.p1;
+x << ifm.E;
+@@
+
+msg="ERROR: %s is NULL but dereferenced." % (x)
+coccilib.report.print_report(p[0], msg)
+cocci.include_match(False)
+
+@script:python depends on !context && !patch && org && !report@
+p << r.p;
+p1 << ifm.p1;
+x << ifm.E;
+@@
+
+msg="ERROR: %s is NULL but dereferenced." % (x)
+msg_safe=msg.replace("[","@(").replace("]",")")
+cocci.print_main(msg_safe,p)
+cocci.include_match(False)
+
+@s depends on !context && !patch && (org || report) exists@
+expression subE <= ifm.E;
+expression *ifm.E;
+expression E1,E2;
+identifier f;
+statement S1,S2,S3,S4;
+iterator iter;
+position p!={pr1.p1,pr2.p2};
+position ifm.p1;
+@@
+
+if@p1 ((E == NULL && ...) || ...)
+{
+  ... when != if (...) S1 else S2
+(
+ iter(subE,...) S4 // no use
+|
+ list_remove_head(E2,subE,...)
+|
+ subE = E1
+|
+ for(subE = E1;...;...) S4
+|
+ subE++
+|
+ ++subE
+|
+ --subE
+|
+ subE--
+|
+ &subE
+|
+ E->f@p // bad use
+)
+  ... when any
+}
+else S3
+
+@script:python depends on !context && !patch && !org && report@
+p << s.p;
+p1 << ifm.p1;
+x << ifm.E;
+@@
+
+msg="ERROR: %s is NULL but dereferenced." % (x)
+coccilib.report.print_report(p[0], msg)
+
+@script:python depends on !context && !patch && org && !report@
+p << s.p;
+p1 << ifm.p1;
+x << ifm.E;
+@@
+
+msg="ERROR: %s is NULL but dereferenced." % (x)
+msg_safe=msg.replace("[","@(").replace("]",")")
+cocci.print_main(msg_safe,p)
+
+// For context mode
+
+@depends on context && !patch && !org && !report exists@
+expression subE <= ifm.E;
+expression *ifm.E;
+expression E1,E2;
+identifier f;
+statement S1,S2,S3,S4;
+iterator iter;
+position p!={pr1.p1,pr2.p2};
+position ifm.p1;
+@@
+
+if@p1 ((E == NULL && ...) || ...)
+{
+  ... when != if (...) S1 else S2
+(
+ iter(subE,...) S4 // no use
+|
+ list_remove_head(E2,subE,...)
+|
+ subE = E1
+|
+ for(subE = E1;...;...) S4
+|
+ subE++
+|
+ ++subE
+|
+ --subE
+|
+ subE--
+|
+ &subE
+|
+* E->f@p // bad use
+)
+  ... when any
+  return ...;
+}
+else S3
+
+// The following three rules are duplicates of ifm, pr1 and pr2 respectively.
+// It is need because the previous rule as already made a "change".
+
+@ifm1 depends on !patch@
+expression *E;
+statement S1,S2;
+position p1;
+@@
+
+if@p1 ((E == NULL && ...) || ...) S1 else S2
+
+@pr11 depends on !patch expression@
+expression *ifm1.E;
+identifier f;
+position p1;
+@@
+
+ (E != NULL && ...) ? <+...E->f@p1...+> : ...
+
+@pr12 depends on !patch expression@
+expression *ifm1.E;
+identifier f;
+position p2;
+@@
+
+(
+  (E != NULL) && ... && <+...E->f@p2...+>
+|
+  (E == NULL) || ... || <+...E->f@p2...+>
+|
+ sizeof(<+...E->f@p2...+>)
+)
+
+@depends on context && !patch && !org && !report exists@
+expression subE <= ifm1.E;
+expression *ifm1.E;
+expression E1,E2;
+identifier f;
+statement S1,S2,S3,S4;
+iterator iter;
+position p!={pr11.p1,pr12.p2};
+position ifm1.p1;
+@@
+
+if@p1 ((E == NULL && ...) || ...)
+{
+  ... when != if (...) S1 else S2
+(
+ iter(subE,...) S4 // no use
+|
+ list_remove_head(E2,subE,...)
+|
+ subE = E1
+|
+ for(subE = E1;...;...) S4
+|
+ subE++
+|
+ ++subE
+|
+ --subE
+|
+ subE--
+|
+ &subE
+|
+* E->f@p // bad use
+)
+  ... when any
+}
+else S3
diff --git a/scripts/coccinelle/err_cast.cocci b/scripts/coccinelle/err_cast.cocci
new file mode 100644
index 000000000000..2ce115000af6
--- /dev/null
+++ b/scripts/coccinelle/err_cast.cocci
@@ -0,0 +1,56 @@
+///
+/// Use ERR_CAST inlined function instead of ERR_PTR(PTR_ERR(...))
+///
+// Confidence: High
+// Copyright: (C) 2009, 2010 Nicolas Palix, DIKU.  GPLv2.
+// Copyright: (C) 2009, 2010 Julia Lawall, DIKU.  GPLv2.
+// Copyright: (C) 2009, 2010 Gilles Muller, INRIA/LiP6.  GPLv2.
+// URL: http://coccinelle.lip6.fr/
+// Options:
+//
+// Keywords: ERR_PTR, PTR_ERR, ERR_CAST
+// Version min: 2.6.25
+//
+
+virtual context
+virtual patch
+virtual org
+virtual report
+
+
+@ depends on context && !patch && !org && !report@
+expression x;
+@@
+
+* ERR_PTR(PTR_ERR(x))
+
+@ depends on !context && patch && !org && !report @
+expression x;
+@@
+
+- ERR_PTR(PTR_ERR(x))
++ ERR_CAST(x)
+
+@r depends on !context && !patch && (org || report)@
+expression x;
+position p;
+@@
+
+ ERR_PTR@p(PTR_ERR(x))
+
+@script:python depends on org@
+p << r.p;
+x << r.x;
+@@
+
+msg="WARNING ERR_CAST can be used with %s" % (x)
+msg_safe=msg.replace("[","@(").replace("]",")")
+coccilib.org.print_todo(p[0], msg_safe)
+
+@script:python depends on report@
+p << r.p;
+x << r.x;
+@@
+
+msg="WARNING: ERR_CAST can be used with %s" % (x)
+coccilib.report.print_report(p[0], msg)
diff --git a/scripts/coccinelle/resource_size.cocci b/scripts/coccinelle/resource_size.cocci
new file mode 100644
index 000000000000..1935a58b39d9
--- /dev/null
+++ b/scripts/coccinelle/resource_size.cocci
@@ -0,0 +1,93 @@
+///
+/// Use resource_size function on resource object
+/// instead of explicit computation.
+///
+//  Confidence: High
+//  Copyright: (C) 2009, 2010 Nicolas Palix, DIKU.  GPLv2.
+//  Copyright: (C) 2009, 2010 Julia Lawall, DIKU.  GPLv2.
+//  Copyright: (C) 2009, 2010 Gilles Muller, INRIA/LiP6.  GPLv2.
+//  URL: http://coccinelle.lip6.fr/
+//  Options:
+//
+//  Keywords: resource_size
+//  Version min: 2.6.27 resource_size
+//
+
+virtual context
+virtual patch
+virtual org
+virtual report
+
+//----------------------------------------------------------
+//  For context mode
+//----------------------------------------------------------
+
+@r_context depends on context && !patch && !org@
+struct resource *res;
+@@
+
+* (res->end - res->start) + 1
+
+//----------------------------------------------------------
+//  For patch mode
+//----------------------------------------------------------
+
+@r_patch depends on !context && patch && !org@
+struct resource *res;
+@@
+
+- (res->end - res->start) + 1
++ resource_size(res)
+
+//----------------------------------------------------------
+//  For org mode
+//----------------------------------------------------------
+
+
+@r_org depends on !context && !patch && (org || report)@
+struct resource *res;
+position p;
+@@
+
+ (res->end@p - res->start) + 1
+
+@rbad_org depends on !context && !patch && (org || report)@
+struct resource *res;
+position p != r_org.p;
+@@
+
+ res->end@p - res->start
+
+@script:python depends on org@
+p << r_org.p;
+x << r_org.res;
+@@
+
+msg="ERROR with %s" % (x)
+msg_safe=msg.replace("[","@(").replace("]",")")
+coccilib.org.print_todo(p[0], msg_safe)
+
+@script:python depends on report@
+p << r_org.p;
+x << r_org.res;
+@@
+
+msg="ERROR: Missing resource_size with %s" % (x)
+coccilib.report.print_report(p[0], msg)
+
+@script:python depends on org@
+p << rbad_org.p;
+x << rbad_org.res;
+@@
+
+msg="WARNING with %s" % (x)
+msg_safe=msg.replace("[","@(").replace("]",")")
+coccilib.org.print_todo(p[0], msg_safe)
+
+@script:python depends on report@
+p << rbad_org.p;
+x << rbad_org.res;
+@@
+
+msg="WARNING: Suspicious code. resource_size is maybe missing with %s" % (x)
+coccilib.report.print_report(p[0], msg)
diff --git a/scripts/decodecode b/scripts/decodecode
index 8b30cc36744f..18ba881c3415 100755
--- a/scripts/decodecode
+++ b/scripts/decodecode
@@ -40,7 +40,7 @@ echo $code
 code=`echo $code | sed -e 's/.*Code: //'`
 
 width=`expr index "$code" ' '`
-width=$[($width-1)/2]
+width=$((($width-1)/2))
 case $width in
 1) type=byte ;;
 2) type=2byte ;;
@@ -48,10 +48,10 @@ case $width in
 esac
 
 disas() {
-        ${CROSS_COMPILE}as $AFLAGS -o $1.o $1.s &> /dev/null
+        ${CROSS_COMPILE}as $AFLAGS -o $1.o $1.s > /dev/null 2>&1
 
-        if [ "$ARCH" == "arm" ]; then
-                if [ $width == 2 ]; then
+        if [ "$ARCH" = "arm" ]; then
+                if [ $width -eq 2 ]; then
                         OBJDUMPFLAGS="-M force-thumb"
                 fi
 
@@ -59,7 +59,7 @@ disas() {
         fi
 
         ${CROSS_COMPILE}objdump $OBJDUMPFLAGS -S $1.o | \
-                grep -v "/tmp\|Disassembly\|\.text\|^$" &> $1.dis
+                grep -v "/tmp\|Disassembly\|\.text\|^$" > $1.dis 2>&1
 }
 
 marker=`expr index "$code" "\<"`
diff --git a/scripts/dtc/fstree.c b/scripts/dtc/fstree.c
index 766b2694d935..8fe1bdf239f0 100644
--- a/scripts/dtc/fstree.c
+++ b/scripts/dtc/fstree.c
@@ -77,6 +77,7 @@ static struct node *read_fstree(const char *dirname)
                 free(tmpnam);
         }
 
+        closedir(d);
         return tree;
 }
 
diff --git a/scripts/kconfig/.gitignore b/scripts/kconfig/.gitignore
index 6a36a76e6606..624f6502e03e 100644
--- a/scripts/kconfig/.gitignore
+++ b/scripts/kconfig/.gitignore
@@ -17,6 +17,7 @@ gconf.glade.h
 #
 conf
 mconf
+nconf
 qconf
 gconf
 kxgettext
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 7ea649da1940..de934def410f 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -21,17 +21,17 @@ menuconfig: $(obj)/mconf
         $< $(Kconfig)
 
 config: $(obj)/conf
-        $< $(Kconfig)
+        $< --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
@@ -44,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                             \
-                        cmp -s .tmp.config .config ||           \
-                        (mv -f .config .config.old.1;           \
-                         mv -f .tmp.config .config;             \
-                         $(obj)/conf -s $(Kconfig);             \
-                         mv -f .config.old.1 .config.old)       \
-        else                                                    \
-                        mv -f .tmp.config .config;              \
-                        $(obj)/conf -s $(Kconfig);              \
+        $(Q)if [ -f .config ]; then                                     \
+                        cmp -s .tmp.config .config ||                   \
+                        (mv -f .config .config.old.1;                   \
+                         mv -f .tmp.config .config;                     \
+                         $(obj)/conf --silentoldconfig $(Kconfig);      \
+                         mv -f .config.old.1 .config.old)               \
+        else                                                            \
+                        mv -f .tmp.config .config;                      \
+                        $(obj)/conf --silentoldconfig $(Kconfig);       \
         fi
         $(Q)rm -f .tmp.config
 
@@ -60,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                             \
-                        cmp -s .tmp.config .config ||           \
-                        (mv -f .config .config.old.1;           \
-                         mv -f .tmp.config .config;             \
-                         $(obj)/conf -s $(Kconfig);             \
-                         mv -f .config.old.1 .config.old)       \
-        else                                                    \
-                        mv -f .tmp.config .config;              \
-                        $(obj)/conf -s $(Kconfig);              \
+        $(Q)if [ -f .config ]; then                                     \
+                        cmp -s .tmp.config .config ||                   \
+                        (mv -f .config .config.old.1;                   \
+                         mv -f .tmp.config .config;                     \
+                         $(obj)/conf --silentoldconfig $(Kconfig);      \
+                         mv -f .config.old.1 .config.old)               \
+        else                                                            \
+                        mv -f .tmp.config .config;                      \
+                        $(obj)/conf --silentoldconfig $(Kconfig);       \
         fi
         $(Q)rm -f .tmp.config
 
@@ -95,30 +95,29 @@ 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
-        $< -r $(Kconfig)
+allnoconfig allyesconfig allmodconfig alldefconfig randconfig: $(obj)/conf
+        $< --$@ $(Kconfig)
 
-allyesconfig: $(obj)/conf
-        $< -y $(Kconfig)
+PHONY += listnewconfig oldnoconfig savedefconfig defconfig
 
-allnoconfig: $(obj)/conf
-        $< -n $(Kconfig)
+listnewconfig oldnoconfig: $(obj)/conf
+        $< --$@ $(Kconfig)
 
-allmodconfig: $(obj)/conf
-        $< -m $(Kconfig)
+savedefconfig: $(obj)/conf
+        $< --$@=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:
@@ -131,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 answer to all options'
-        @echo  '  allmodconfig    - New config selecting modules when possible'
-        @echo  '  allyesconfig    - New config where all options are accepted with yes'
+        @echo  '  defconfig       - New config with default from ARCH supplied defconfig'
+        @echo  '  savedefconfig   - Save current config as ./defconfig (minimal config)'
         @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
diff --git a/scripts/kconfig/conf.c b/scripts/kconfig/conf.c
index 9960d1c303f8..010600ef58c0 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 {
-        ask_all,
-        ask_new,
-        ask_silent,
-        set_default,
-        set_yes,
-        set_mod,
-        set_no,
-        set_random
-} input_mode = ask_all;
+enum input_mode {
+        oldaskconfig,
+        silentoldconfig,
+        oldconfig,
+        allnoconfig,
+        allyesconfig,
+        allmodconfig,
+        alldefconfig,
+        randconfig,
+        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 ask_silent:
+        case oldconfig:
+        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 ask_silent:
+                case oldconfig:
+                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++)
-                                printf(_("*\n* Restart config...\n*\n"));
-                        rootEntry = menu_get_parent_menu(menu);
-                        conf(rootEntry);
+                        if (input_mode == listnewconfig) {
+                                if (sym->name && !sym_is_choice_value(sym)) {
+                                        printf("CONFIG_%s\n", sym->name);
+                                }
+                        } 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':
-                        input_mode = ask_silent;
-                        break;
-                case 's':
-                        input_mode = ask_silent;
+                case silentoldconfig:
                         sync_kconfig = 1;
                         break;
-                case 'd':
-                        input_mode = set_default;
-                        break;
-                case 'D':
-                        input_mode = set_default;
+                case defconfig:
+                case savedefconfig:
                         defconfig_file = optarg;
                         break;
-                case 'n':
-                        input_mode = set_no;
-                        break;
-                case 'm':
-                        input_mode = set_mod;
-                        break;
-                case 'y':
-                        input_mode = set_yes;
-                        break;
-                case 'r':
+                case randconfig:
                 {
                         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':
-                        printf(_("See README for usage info\n"));
-                        exit(0);
-                        break;
-                default:
+                case '?':
                         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 ask_all:
-        case ask_new:
+        case savedefconfig:
+                conf_read(NULL);
+                break;
+        case silentoldconfig:
+        case oldaskconfig:
+        case oldconfig:
+        case listnewconfig:
+        case oldnoconfig:
                 conf_read(NULL);
                 break;
-        case set_no:
-        case set_mod:
-        case set_yes:
-        case set_random:
+        case allnoconfig:
+        case allyesconfig:
+        case allmodconfig:
+        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 set_mod:    name = "allmod.config"; break;
-                case set_yes:    name = "allyes.config"; break;
-                case set_random: name = "allrandom.config"; break;
+                case allnoconfig:       name = "allno.config"; break;
+                case allyesconfig:      name = "allyes.config"; break;
+                case allmodconfig:      name = "allmod.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 ask_all:
+        case savedefconfig:
+                break;
+        case oldconfig:
+        case oldaskconfig:
                 rootEntry = &rootmenu;
                 conf(&rootmenu);
-                input_mode = ask_silent;
+                input_mode = silentoldconfig;
                 /* fall through */
-        case ask_silent:
+        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) {
-                        case S_BOOLEAN:
-                        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;
-                        }
+                        /* Write config symbol to file */
+                        conf_write_symbol(sym, type, out, true);
                 }
 
-        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);
-                        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);
+                        conf_write_string(true, sym->name, sym_get_string_value(sym), 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 d83f2322893a..8f18e37892cb 100644
--- a/scripts/kconfig/expr.c
+++ b/scripts/kconfig/expr.c
@@ -1121,7 +1121,7 @@ static void expr_print_gstr_helper(void *data, struct symbol *sym, const char *s
         }
 
         str_append(gs, str);
-        if (sym)
+        if (sym && sym->type != S_UNKNOWN)
                 str_printf(gs, " [=%s]", sym_str);
 }
 
diff --git a/scripts/kconfig/expr.h b/scripts/kconfig/expr.h
index 891cd9ce9ba2..6ee2e4fb1481 100644
--- a/scripts/kconfig/expr.h
+++ b/scripts/kconfig/expr.h
@@ -83,6 +83,7 @@ struct symbol {
         tristate visible;
         int flags;
         struct property *prop;
+        struct expr_value dir_dep;
         struct expr_value rev_dep;
 };
 
@@ -131,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 {
@@ -163,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 bef10411837f..d66988265f89 100644
--- a/scripts/kconfig/gconf.c
+++ b/scripts/kconfig/gconf.c
@@ -1114,7 +1114,7 @@ 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 (opt_mode == OPT_ALL && !menu_is_visible(menu))
                 row[COL_COLOR] = g_strdup("DarkGray");
@@ -1343,7 +1343,8 @@ static void update_tree(struct menu *src, GtkTreeIter * dst)
 #endif
 
                 if ((opt_mode == OPT_NORMAL && !menu_is_visible(child1)) ||
-                    (opt_mode == OPT_PROMPT && !menu_has_prompt(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) {
@@ -1425,7 +1426,7 @@ static void display_tree(struct menu *menu)
 
                 if ((opt_mode == OPT_NORMAL && menu_is_visible(child)) ||
                     (opt_mode == OPT_PROMPT && menu_has_prompt(child)) ||
-                    (opt_mode == OPT_ALL))
+                    (opt_mode == OPT_ALL    && menu_get_prompt(child)))
                         place_node(child, fill_row(child));
 #ifdef DEBUG
                 printf("%*c%s: ", indent, ' ', menu_get_prompt(child));
diff --git a/scripts/kconfig/lkc.h b/scripts/kconfig/lkc.h
index ce6549cdaccf..76db065ed72c 100644
--- a/scripts/kconfig/lkc.h
+++ b/scripts/kconfig/lkc.h
@@ -126,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 7cadcad8233b..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));
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/mconf.c b/scripts/kconfig/mconf.c
index 2c83d3234d30..d2f6e056c058 100644
--- a/scripts/kconfig/mconf.c
+++ b/scripts/kconfig/mconf.c
@@ -74,7 +74,7 @@ static const char mconf_readme[] = N_(
 "\n"
 "   Shortcut: Press <H> or <?>.\n"
 "\n"
-"o  To show hidden options, press <Z>.\n"
+"o  To toggle the display of hidden options, press <Z>.\n"
 "\n"
 "\n"
 "Radiolists  (Choice lists)\n"
diff --git a/scripts/kconfig/menu.c b/scripts/kconfig/menu.c
index 203632cc30bd..4fb590247f33 100644
--- a/scripts/kconfig/menu.c
+++ b/scripts/kconfig/menu.c
@@ -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)
@@ -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));
@@ -419,9 +426,13 @@ bool menu_is_visible(struct menu *menu)
         if (!sym || sym_get_tristate_value(menu->sym) == no)
                 return false;
 
-        for (child = menu->list; child; child = child->next)
-                if (menu_is_visible(child))
+        for (child = menu->list; child; child = child->next) {
+                if (menu_is_visible(child)) {
+                        if (sym)
+                                sym->flags |= SYMBOL_DEF_USER;
                         return true;
+                }
+        }
 
         return false;
 }
@@ -501,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;
diff --git a/scripts/kconfig/nconf.gui.c b/scripts/kconfig/nconf.gui.c
index 115edb437fb1..a9d9344e1365 100644
--- a/scripts/kconfig/nconf.gui.c
+++ b/scripts/kconfig/nconf.gui.c
@@ -226,7 +226,7 @@ void fill_window(WINDOW *win, const char *text)
                 int len = get_line_length(line);
                 strncpy(tmp, line, min(len, x));
                 tmp[len] = '\0';
-                mvwprintw(win, i, 0, tmp);
+                mvwprintw(win, i, 0, "%s", tmp);
         }
 }
 
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;
-                for (it = entryList.begin(); it != entryList.end(); ++it)
-                        result.push_back((*it).toInt());
-        }
+        QStringList::Iterator it;
+
+        for (it = entryList.begin(); it != entryList.end(); ++it)
+                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) {
-                list->showAll = b;
-                list->updateListAll();
-                emit showAllChanged(b);
-        }
+        if (act == showNormalAction)
+                list->optMode = normalOpt;
+        else if (act == showAllAction)
+                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);
-          connect(showAllAction, SIGNAL(toggled(bool)), configView, SLOT(setShowAll(bool)));
-          connect(showAllAction, SIGNAL(toggled(bool)), menuView, SLOT(setShowAll(bool)));
-          showAllAction->setOn(configList->showAll);
+
+        QActionGroup *optGroup = new QActionGroup(this);
+        optGroup->setExclusive(TRUE);
+        connect(optGroup, SIGNAL(selected(QAction *)), configView,
+                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/symbol.c b/scripts/kconfig/symbol.c
index 2e7a048e0cfc..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) {
-                sym_calc_visibility(def_sym);
+        expr_list_for_each_sym(prop->expr, e, def_sym)
                 if (def_sym->visible != no)
                         return def_sym;
-        }
 
-        /* no choice? reset tristate value */
-        sym->curr.tri = no;
+        /* failed to locate any defaults */
         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 (flags & SYMBOL_CHANGED)
+                        if ((sym->flags & SYMBOL_WRITE) &&
+                            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;
@@ -765,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)
 {
@@ -801,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;
 }
 
@@ -827,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)
@@ -840,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) {
-                        fprintf(stderr, " -> %s", sym->name);
+                if (sym2)
                         break;
-                }
         }
 out:
         expr_list_for_each_sym(prop->expr, e, sym)
@@ -853,6 +1079,8 @@ out:
             prop_get_symbol(sym_get_choice_prop(sym2)) == choice)
                 sym2 = choice;
 
+        dep_stack_remove();
+
         return sym2;
 }
 
@@ -862,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->prop->file->name, sym->prop->lineno,
-                        sym->name ? sym->name : "<choice>");
+                sym_check_print_recursive(sym);
                 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 {
@@ -882,14 +1112,8 @@ struct symbol *sym_check_deps(struct symbol *sym)
                 sym->flags &= ~SYMBOL_CHECK;
         }
 
-        if (sym2) {
-                fprintf(stderr, " -> %s", sym->name ? sym->name : "<choice>");
-                if (sym2 == sym) {
-                        fprintf(stderr, "\n");
-                        zconfnerrs++;
-                        sym2 = NULL;
-                }
-        }
+        if (sym2 && sym2 == sym)
+                sym2 = NULL;
 
         return sym2;
 }
@@ -943,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/mod/file2alias.c b/scripts/mod/file2alias.c
index 5758aab0d8bb..88f3f07205f8 100644
--- a/scripts/mod/file2alias.c
+++ b/scripts/mod/file2alias.c
@@ -884,16 +884,16 @@ void handle_moddevtable(struct module *mod, struct elf_info *info,
         char *zeros = NULL;
 
         /* We're looking for a section relative symbol */
-        if (!sym->st_shndx || sym->st_shndx >= info->hdr->e_shnum)
+        if (!sym->st_shndx || get_secindex(info, sym) >= info->num_sections)
                 return;
 
         /* Handle all-NULL symbols allocated into .bss */
-        if (info->sechdrs[sym->st_shndx].sh_type & SHT_NOBITS) {
+        if (info->sechdrs[get_secindex(info, sym)].sh_type & SHT_NOBITS) {
                 zeros = calloc(1, sym->st_size);
                 symval = zeros;
         } else {
                 symval = (void *)info->hdr
-                        + info->sechdrs[sym->st_shndx].sh_offset
+                        + info->sechdrs[get_secindex(info, sym)].sh_offset
                         + sym->st_value;
         }
 
diff --git a/scripts/mod/modpost.c b/scripts/mod/modpost.c
index f8779006986d..c827309c29cf 100644
--- a/scripts/mod/modpost.c
+++ b/scripts/mod/modpost.c
@@ -253,7 +253,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 +373,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 +419,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 +452,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++) {
-                const char *secstrings
-                        = (void *)hdr + sechdrs[hdr->e_shstrndx].sh_offset;
+        secstrings = (void *)hdr + sechdrs[info->secindex_strings].sh_offset;
+        for (i = 1; i < info->num_sections; i++) {
                 const char *secname;
                 int nobits = sechdrs[i].sh_type == SHT_NOBITS;
 
@@ -461,14 +481,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)
-                        continue;
+                if (sechdrs[i].sh_type == SHT_SYMTAB) {
+                        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;
-                info->symtab_stop  = (void *)hdr + sechdrs[i].sh_offset
-                                                 + sechdrs[i].sh_size;
-                info->strtab       = (void *)hdr +
-                                     sechdrs[sechdrs[i].sh_link].sh_offset;
+                /* 32bit section no. table? ("more than 64k sections") */
+                if (sechdrs[i].sh_type == SHT_SYMTAB_SHNDX) {
+                        symtab_shndx_idx = i;
+                        info->symtab_shndx_start = (void *)hdr +
+                            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 +512,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 +550,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 +566,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 +708,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 +
-                sechdrs[shndx].sh_name;
+                elf->sechdrs[elf->secindex_strings].sh_offset +
+                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 +
-                sechdr->sh_name;
+                elf->sechdrs[elf->secindex_strings].sh_offset +
+                sechdr->sh_name;
 }
 
 /* if sym is empty or point to a string
@@ -1047,11 +1099,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;
@@ -1113,9 +1168,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))
@@ -1311,7 +1366,7 @@ static void check_section_mismatch(const char *modname, struct elf_info *elf,
         const char *tosec;
         const struct sectioncheck *mismatch;
 
-        tosec = sec_name(elf, sym->st_shndx);
+        tosec = sec_name(elf, get_secindex(elf, sym));
         mismatch = section_mismatch(fromsec, tosec);
         if (mismatch) {
                 Elf_Sym *to;
@@ -1339,7 +1394,7 @@ static unsigned int *reloc_location(struct elf_info *elf,
                                     Elf_Shdr *sechdr, Elf_Rela *r)
 {
         Elf_Shdr *sechdrs = elf->sechdrs;
-        int section = sechdr->sh_info;
+        int section = shndx2secindex(sechdr->sh_info);
 
         return (void *)elf->hdr + sechdrs[section].sh_offset +
                 r->r_offset - sechdrs[section].sh_addr;
@@ -1447,7 +1502,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);
         }
@@ -1505,7 +1560,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);
         }
@@ -1530,7 +1585,7 @@ static void check_sec_ref(struct module *mod, const char *modname,
         Elf_Shdr *sechdrs = elf->sechdrs;
 
         /* Walk through all sections */
-        for (i = 0; i < elf->hdr->e_shnum; i++) {
+        for (i = 0; i < elf->num_sections; i++) {
                 check_section(modname, elf, &elf->sechdrs[i]);
                 /* We want to process only relocation sections and not .init */
                 if (sechdrs[i].sh_type == SHT_RELA)
diff --git a/scripts/mod/modpost.h b/scripts/mod/modpost.h
index be987a44f250..0388cfccac8d 100644
--- a/scripts/mod/modpost.h
+++ b/scripts/mod/modpost.h
@@ -129,8 +129,51 @@ struct elf_info {
         const char   *strtab;
         char         *modinfo;
         unsigned int modinfo_len;
+
+        /* support for 32bit section numbers */
+
+        unsigned int num_sections; /* max_secindex + 1 */
+        unsigned int secindex_strings;
+        /* if Nth symbol table entry has .st_shndx = SHN_XINDEX,
+         * take shndx from symtab_shndx_start[N] instead */
+        Elf32_Word   *symtab_shndx_start;
+        Elf32_Word   *symtab_shndx_stop;
 };
 
+static inline int is_shndx_special(unsigned int i)
+{
+        return i != SHN_XINDEX && i >= SHN_LORESERVE && i <= SHN_HIRESERVE;
+}
+
+/* shndx is in [0..SHN_LORESERVE) U (SHN_HIRESERVE, 0xfffffff], thus:
+ * shndx == 0               <=> sechdrs[0]
+ * ......
+ * shndx == SHN_LORESERVE-1 <=> sechdrs[SHN_LORESERVE-1]
+ * shndx == SHN_HIRESERVE+1 <=> sechdrs[SHN_LORESERVE]
+ * shndx == SHN_HIRESERVE+2 <=> sechdrs[SHN_LORESERVE+1]
+ * ......
+ * fyi: sym->st_shndx is uint16, SHN_LORESERVE = ff00, SHN_HIRESERVE = ffff,
+ * so basically we map  0000..feff -> 0000..feff
+ *                      ff00..ffff -> (you are a bad boy, dont do it)
+ *                     10000..xxxx -> ff00..(xxxx-0x100)
+ */
+static inline unsigned int shndx2secindex(unsigned int i)
+{
+        if (i <= SHN_HIRESERVE)
+                return i;
+        return i - (SHN_HIRESERVE + 1 - SHN_LORESERVE);
+}
+
+/* Accessor for sym->st_shndx, hides ugliness of "64k sections" */
+static inline unsigned int get_secindex(const struct elf_info *info,
+                                        const Elf_Sym *sym)
+{
+        if (sym->st_shndx != SHN_XINDEX)
+                return sym->st_shndx;
+        return shndx2secindex(info->symtab_shndx_start[sym -
+                                                       info->symtab_start]);
+}
+
 /* file2alias.c */
 extern unsigned int cross_build;
 void handle_moddevtable(struct module *mod, struct elf_info *info,
diff --git a/scripts/package/Makefile b/scripts/package/Makefile
index 3a681ef25306..d2c29b63adda 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 --scm-only > $(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
diff --git a/scripts/package/builddeb b/scripts/package/builddeb
index 07f2fbde2abf..5f1e2fc7f171 100644
--- a/scripts/package/builddeb
+++ b/scripts/package/builddeb
@@ -148,10 +148,11 @@ EOF
 # Generate a control file
 cat <<EOF > debian/control
 Source: linux-upstream
-Section: admin
+Section: kernel
 Priority: optional
 Maintainer: $maintainer
-Standards-Version: 3.8.1
+Standards-Version: 3.8.4
+Homepage: http://www.kernel.org/
 EOF
 
 if [ "$ARCH" = "um" ]; then
diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index d6a866ed1835..64a9cb5556cd 100755
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -10,13 +10,13 @@
 #
 
 usage() {
-        echo "Usage: $0 [--scm-only] [srctree]" >&2
+        echo "Usage: $0 [--save-scmversion] [srctree]" >&2
         exit 1
 }
 
 scm_only=false
 srctree=.
-if test "$1" = "--scm-only"; then
+if test "$1" = "--save-scmversion"; then
         scm_only=true
         shift
 fi
@@ -30,11 +30,12 @@ fi
 
 scm_version()
 {
-        local short=false
+        local short
+        short=false
 
         cd "$srctree"
         if test -e .scmversion; then
-                cat "$_"
+                cat .scmversion
                 return
         fi
         if test "$1" = "--short"; then
@@ -131,12 +132,15 @@ collect_files()
 }
 
 if $scm_only; then
-        scm_version
+        if test ! -e .scmversion; then
+                res=$(scm_version)
+                echo "$res" >.scmversion
+        fi
         exit
 fi
 
 if test -e include/config/auto.conf; then
-        source "$_"
+        . include/config/auto.conf
 else
         echo "Error: kernelrelease not valid - run 'make prepare' to update it"
         exit 1