Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3df302ff authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 685d87f7 64a99d2a

Makefile

+4 −4
Original line number Original line Diff line number Diff line
@@ -929,8 +929,8 @@ ifneq ($(KBUILD_SRC),) 
		echo "  in the '$(srctree)' directory.";\

		echo "  in the '$(srctree)' directory.";\

		/bin/false; \

		/bin/false; \

	fi;

	fi;

	$(Q)if [ ! -d include2 ]; then mkdir -p include2; fi;

	$(Q)if [ ! -d include2 ]; then                                  \

	$(Q)if [ -e $(srctree)/include/asm-$(SRCARCH)/errno.h ]; then  \

	    mkdir -p include2;                                          \

	    ln -fsn $(srctree)/include/asm-$(SRCARCH) include2/asm;     \

	    ln -fsn $(srctree)/include/asm-$(SRCARCH) include2/asm;     \

	fi

	fi

endif

endif
@@ -1492,7 +1492,7 @@ quiet_cmd_cscope-file = FILELST cscope.files 
      cmd_cscope-file = (echo \-k; echo \-q; $(all-sources)) > cscope.files

      cmd_cscope-file = (echo \-k; echo \-q; $(all-sources)) > cscope.files





quiet_cmd_cscope = MAKE    cscope.out

quiet_cmd_cscope = MAKE    cscope.out

      cmd_cscope = cscope -b

      cmd_cscope = cscope -b -f cscope.out





cscope: FORCE

cscope: FORCE

	$(call cmd,cscope-file)

	$(call cmd,cscope-file)

init/Kconfig

+4 −5
Original line number Original line Diff line number Diff line
@@ -845,9 +845,10 @@ menuconfig MODULES 




	  If unsure, say Y.

	  If unsure, say Y.





if MODULES



config MODULE_FORCE_LOAD

config MODULE_FORCE_LOAD

	bool "Forced module loading"

	bool "Forced module loading"

	depends on MODULES

	default n

	default n

	help

	help

	  Allow loading of modules without version information (ie. modprobe

	  Allow loading of modules without version information (ie. modprobe
@@ -856,7 +857,6 @@ config MODULE_FORCE_LOAD 




config MODULE_UNLOAD

config MODULE_UNLOAD

	bool "Module unloading"

	bool "Module unloading"

	depends on MODULES

	help

	help

	  Without this option you will not be able to unload any

	  Without this option you will not be able to unload any

	  modules (note that some modules may not be unloadable

	  modules (note that some modules may not be unloadable
@@ -875,7 +875,6 @@ config MODULE_FORCE_UNLOAD 




config MODVERSIONS

config MODVERSIONS

	bool "Module versioning support"

	bool "Module versioning support"

	depends on MODULES

	help

	help

	  Usually, you have to use modules compiled with your kernel.

	  Usually, you have to use modules compiled with your kernel.

	  Saying Y here makes it sometimes possible to use modules

	  Saying Y here makes it sometimes possible to use modules
@@ -886,7 +885,6 @@ config MODVERSIONS 




config MODULE_SRCVERSION_ALL

config MODULE_SRCVERSION_ALL

	bool "Source checksum for all modules"

	bool "Source checksum for all modules"

	depends on MODULES

	help

	help

	  Modules which contain a MODULE_VERSION get an extra "srcversion"

	  Modules which contain a MODULE_VERSION get an extra "srcversion"

	  field inserted into their modinfo section, which contains a

	  field inserted into their modinfo section, which contains a
@@ -898,11 +896,12 @@ config MODULE_SRCVERSION_ALL 




config KMOD

config KMOD

	def_bool y

	def_bool y

	depends on MODULES

	help

	help

	  This is being removed soon.  These days, CONFIG_MODULES

	  This is being removed soon.  These days, CONFIG_MODULES

	  implies CONFIG_KMOD, so use that instead.

	  implies CONFIG_KMOD, so use that instead.





endif # MODULES



config STOP_MACHINE

config STOP_MACHINE

	bool

	bool

	default y

	default y

scripts/patch-kernel

+2 −1
Original line number Original line Diff line number Diff line
@@ -213,6 +213,7 @@ fi 
if [ $stopvers != "default" ]; then

if [ $stopvers != "default" ]; then

	STOPSUBLEVEL=`echo $stopvers | cut -d. -f3`

	STOPSUBLEVEL=`echo $stopvers | cut -d. -f3`

	STOPEXTRA=`echo $stopvers | cut -d. -f4`

	STOPEXTRA=`echo $stopvers | cut -d. -f4`

	STOPFULLVERSION=${stopvers%%.$STOPEXTRA}

	#echo "#___STOPSUBLEVEL=/$STOPSUBLEVEL/, STOPEXTRA=/$STOPEXTRA/"

	#echo "#___STOPSUBLEVEL=/$STOPSUBLEVEL/, STOPEXTRA=/$STOPEXTRA/"

else

else

	STOPSUBLEVEL=9999

	STOPSUBLEVEL=9999
@@ -249,7 +250,7 @@ while : # incrementing SUBLEVEL (s in v.p.s) 
do

do

    CURRENTFULLVERSION="$VERSION.$PATCHLEVEL.$SUBLEVEL"

    CURRENTFULLVERSION="$VERSION.$PATCHLEVEL.$SUBLEVEL"

    EXTRAVER=

    EXTRAVER=

    if [ $stopvers = $CURRENTFULLVERSION ]; then

    if [ $STOPFULLVERSION = $CURRENTFULLVERSION ]; then

        echo "Stopping at $CURRENTFULLVERSION base as requested."

        echo "Stopping at $CURRENTFULLVERSION base as requested."

        break

        break

    fi

    fi