Merge git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes

* git://git.kernel.org/pub/scm/linux/kernel/git/sam/kbuild-fixes:
  kbuild: a better way to generate cscope database change
  Kconfig: Extend "menuconfig" for modules to simplify Kconfig file
  bugfix for scripts/patch-kernel in 2.6 sublevel stepping
  kbuild: fix O=.. build with arm

3 files changed, 10 insertions, 10 deletions

diff --git a/Makefile b/Makefile
index ea413fa03e4e..f3e206509ee1 100644
--- a/Makefile
+++ b/Makefile
@@ -929,10 +929,10 @@ ifneq ($(KBUILD_SRC),)
                 echo "  in the '$(srctree)' directory.";\
                 /bin/false; \
         fi;
-        $(Q)if [ ! -d include2 ]; then mkdir -p include2; fi;
-        $(Q)if [ -e $(srctree)/include/asm-$(SRCARCH)/errno.h ]; then  \
+        $(Q)if [ ! -d include2 ]; then                                  \
+            mkdir -p include2;                                          \
             ln -fsn $(srctree)/include/asm-$(SRCARCH) include2/asm;     \
-            fi
+        fi
 endif
 
 # prepare2 creates a makefile if using a separate output directory
@@ -1492,7 +1492,7 @@ quiet_cmd_cscope-file = FILELST cscope.files
       cmd_cscope-file = (echo \-k; echo \-q; $(all-sources)) > cscope.files
 
 quiet_cmd_cscope = MAKE    cscope.out
-      cmd_cscope = cscope -b
+      cmd_cscope = cscope -b -f cscope.out
 
 cscope: FORCE
         $(call cmd,cscope-file)
diff --git a/init/Kconfig b/init/Kconfig
index 7e6dae1ae727..b678803deccf 100644
--- a/init/Kconfig
+++ b/init/Kconfig
@@ -845,9 +845,10 @@ menuconfig MODULES
 
           If unsure, say Y.
 
+if MODULES
+
 config MODULE_FORCE_LOAD
         bool "Forced module loading"
-        depends on MODULES
         default n
         help
           Allow loading of modules without version information (ie. modprobe
@@ -856,7 +857,6 @@ config MODULE_FORCE_LOAD
 
 config MODULE_UNLOAD
         bool "Module unloading"
-        depends on MODULES
         help
           Without this option you will not be able to unload any
           modules (note that some modules may not be unloadable
@@ -875,7 +875,6 @@ config MODULE_FORCE_UNLOAD
 
 config MODVERSIONS
         bool "Module versioning support"
-        depends on MODULES
         help
           Usually, you have to use modules compiled with your kernel.
           Saying Y here makes it sometimes possible to use modules
@@ -886,7 +885,6 @@ config MODVERSIONS
 
 config MODULE_SRCVERSION_ALL
         bool "Source checksum for all modules"
-        depends on MODULES
         help
           Modules which contain a MODULE_VERSION get an extra "srcversion"
           field inserted into their modinfo section, which contains a
@@ -898,11 +896,12 @@ config MODULE_SRCVERSION_ALL
 
 config KMOD
         def_bool y
-        depends on MODULES
         help
           This is being removed soon.  These days, CONFIG_MODULES
           implies CONFIG_KMOD, so use that instead.
 
+endif # MODULES
+
 config STOP_MACHINE
         bool
         default y
diff --git a/scripts/patch-kernel b/scripts/patch-kernel
index ece46ef0ba54..46a59cae3a0a 100755
--- a/scripts/patch-kernel
+++ b/scripts/patch-kernel
@@ -213,6 +213,7 @@ fi
 if [ $stopvers != "default" ]; then
         STOPSUBLEVEL=`echo $stopvers | cut -d. -f3`
         STOPEXTRA=`echo $stopvers | cut -d. -f4`
+        STOPFULLVERSION=${stopvers%%.$STOPEXTRA}
         #echo "#___STOPSUBLEVEL=/$STOPSUBLEVEL/, STOPEXTRA=/$STOPEXTRA/"
 else
         STOPSUBLEVEL=9999
@@ -249,7 +250,7 @@ while :				# incrementing SUBLEVEL (s in v.p.s)
 do
     CURRENTFULLVERSION="$VERSION.$PATCHLEVEL.$SUBLEVEL"
     EXTRAVER=
-    if [ $stopvers = $CURRENTFULLVERSION ]; then
+    if [ $STOPFULLVERSION = $CURRENTFULLVERSION ]; then
         echo "Stopping at $CURRENTFULLVERSION base as requested."
         break
     fi