From: Michal Marek <mmarek@suse.cz>
Date: Wed, 4 Aug 2010 12:05:07 +0000 (+0200)
Subject: Merge commit 'v2.6.35' into kbuild/kconfig
X-Git-Tag: accepted/tizen/common/20141203.182822~9251^2~44
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7a996d3ab150bb0e1b71fa182f70199a703efdd1;p=platform%2Fkernel%2Flinux-arm64.git

Merge commit 'v2.6.35' into kbuild/kconfig

Conflicts:
	scripts/kconfig/Makefile
---

7a996d3ab150bb0e1b71fa182f70199a703efdd1
diff --cc scripts/kconfig/Makefile
index c0e459e,7ea649d..de934de
--- a/scripts/kconfig/Makefile
+++ b/scripts/kconfig/Makefile
@@@ -31,34 -31,44 +31,44 @@@ oldconfig: $(obj)/con
  
  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
+ LSMOD_F := $(LSMOD)
+ ifeq ($(findstring /,$(LSMOD)),)
+   LSMOD_F := $(objtree)/$(LSMOD)
+ endif
+ endif
+ 
  localmodconfig: $(obj)/streamline_config.pl $(obj)/conf
- 	$(Q)perl $< $(srctree) $(Kconfig) > .tmp.config
- 	$(Q)if [ -f .config ]; then					\
+ 	$(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
  
  localyesconfig: $(obj)/streamline_config.pl $(obj)/conf
- 	$(Q)perl $< $(srctree) $(Kconfig) > .tmp.config
+ 	$(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