4 files changed, 414 insertions, 2 deletions

diff --git a/kernel/Makefile b/kernel/Makefile
index b833bd5cc127..961379caf666 100644
--- a/kernel/Makefile
+++ b/kernel/Makefile
@@ -117,7 +117,7 @@ $(obj)/config_data.gz: .config FORCE
         $(call if_changed,gzip)
 
 quiet_cmd_ikconfiggz = IKCFG   $@
-      cmd_ikconfiggz = (echo "static const char kernel_config_data[] = MAGIC_START"; cat $< | scripts/bin2c; echo "MAGIC_END;") > $@
+      cmd_ikconfiggz = (echo "static const char kernel_config_data[] __used = MAGIC_START"; cat $< | scripts/bin2c; echo "MAGIC_END;") > $@
 targets += config_data.h
 $(obj)/config_data.h: $(obj)/config_data.gz FORCE
         $(call if_changed,ikconfiggz)
diff --git a/scripts/extract-ikconfig b/scripts/extract-ikconfig
index 72997c353cb3..de233ff43c1c 100755
--- a/scripts/extract-ikconfig
+++ b/scripts/extract-ikconfig
@@ -17,6 +17,10 @@ dump_config() {
         return
     fi
     end=`$binoffset $file $IKCFG_ED 2>/dev/null`
+    [ "$?" != "0" ] && end="-1"
+    if [ "$end" -eq "-1" ]; then
+        return
+    fi
 
     start=`expr $start + 8`
     size=`expr $end - $start`
@@ -55,6 +59,8 @@ dump_config "$image"
 GZHDR1="0x1f 0x8b 0x08 0x00"
 GZHDR2="0x1f 0x8b 0x08 0x08"
 
+ELFHDR="0x7f 0x45 0x4c 0x46"
+
 # vmlinux.gz: Check for a compressed images
 off=`$binoffset "$image" $GZHDR1 2>/dev/null`
 [ "$?" != "0" ] && off="-1"
@@ -69,6 +75,14 @@ elif [ "$off" -ne "-1" ]; then
         (dd ibs="$off" skip=1 count=0 && dd bs=512k) <"$image" 2>/dev/null | \
                 zcat >"$TMPFILE"
         dump_config "$TMPFILE"
+
+# check if this is simply an ELF file
+else
+        off=`$binoffset "$image" $ELFHDR 2>/dev/null`
+        [ "$?" != "0" ] && off="-1"
+        if [ "$off" -eq "0" ]; then
+                dump_config "$image"
+        fi
 fi
 
 echo "ERROR: Unable to extract kernel configuration information."
diff --git a/scripts/kconfig/Makefile b/scripts/kconfig/Makefile
index 5ddf8becd7a2..6d69c7ccdcc7 100644
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@ -2,7 +2,8 @@
 # Kernel configuration targets
 # These targets are used from top-level makefile
 
-PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-config
+PHONY += oldconfig xconfig gconfig menuconfig config silentoldconfig update-po-config \
+        localmodconfig localyesconfig
 
 ifdef KBUILD_KCONFIG
 Kconfig := $(KBUILD_KCONFIG)
@@ -28,6 +29,35 @@ oldconfig: $(obj)/conf
 silentoldconfig: $(obj)/conf
         $< -s $(Kconfig)
 
+localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
+        $(Q)perl $< $(Kconfig) > .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);              \
+        fi
+        $(Q)rm -f .tmp.config
+
+localyesconfig: $(obj)/streamline_config.pl $(obj)/conf
+        $(Q)perl $< $(Kconfig) > .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);              \
+        fi
+        $(Q)rm -f .tmp.config
+
 # Create new linux.pot file
 # Adjust charset to UTF-8 in .po file to accept UTF-8 in Kconfig files
 # The symlink is used to repair a deficiency in arch/um
@@ -83,6 +113,8 @@ help:
         @echo  '  xconfig         - Update current config utilising a QT based front-end'
         @echo  '  gconfig         - Update current config utilising a GTK based front-end'
         @echo  '  oldconfig       - Update current config utilising a provided .config as base'
+        @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'
diff --git a/scripts/kconfig/streamline_config.pl b/scripts/kconfig/streamline_config.pl
new file mode 100644
index 000000000000..95984db8e1e0
--- /dev/null
+++ b/scripts/kconfig/streamline_config.pl
@@ -0,0 +1,366 @@
+#!/usr/bin/perl -w
+#
+# Copywrite 2005-2009 - Steven Rostedt
+# Licensed under the terms of the GNU GPL License version 2
+#
+#  It's simple enough to figure out how this works.
+#  If not, then you can ask me at stripconfig@goodmis.org
+#
+# What it does?
+#
+#   If you have installed a Linux kernel from a distribution
+#   that turns on way too many modules than you need, and
+#   you only want the modules you use, then this program
+#   is perfect for you.
+#
+#   It gives you the ability to turn off all the modules that are
+#   not loaded on your system.
+#
+# Howto:
+#
+#  1. Boot up the kernel that you want to stream line the config on.
+#  2. Change directory to the directory holding the source of the
+#       kernel that you just booted.
+#  3. Copy the configuraton file to this directory as .config
+#  4. Have all your devices that you need modules for connected and
+#      operational (make sure that their corresponding modules are loaded)
+#  5. Run this script redirecting the output to some other file
+#       like config_strip.
+#  6. Back up your old config (if you want too).
+#  7. copy the config_strip file to .config
+#  8. Run "make oldconfig"
+#
+#  Now your kernel is ready to be built with only the modules that
+#  are loaded.
+#
+# Here's what I did with my Debian distribution.
+#
+#    cd /usr/src/linux-2.6.10
+#    cp /boot/config-2.6.10-1-686-smp .config
+#    ~/bin/streamline_config > config_strip
+#    mv .config config_sav
+#    mv config_strip .config
+#    make oldconfig
+#
+my $config = ".config";
+my $linuxpath = ".";
+
+my $uname = `uname -r`;
+chomp $uname;
+
+my @searchconfigs = (
+        {
+            "file" => ".config",
+            "exec" => "cat",
+        },
+        {
+            "file" => "/proc/config.gz",
+            "exec" => "zcat",
+        },
+        {
+            "file" => "/boot/config-$uname",
+            "exec" => "cat",
+        },
+        {
+            "file" => "/boot/vmlinuz-$uname",
+            "exec" => "scripts/extract-ikconfig",
+            "test" => "scripts/extract-ikconfig",
+        },
+        {
+            "file" => "vmlinux",
+            "exec" => "scripts/extract-ikconfig",