1 files changed, 25 insertions, 9 deletions

diff --git a/Makefile b/Makefile
index e8906694dcc5..a21c3192e8c9 100644
--- a/Makefile
+++ b/Makefile
@@ -1192,25 +1192,35 @@ endif
 
 ALLSOURCE_ARCHS := $(ARCH)
 
-define all-sources
-        ( find $(__srctree) $(RCS_FIND_IGNORE) \
+define find-sources
+        ( find $(__srctree) $(RCS_FIND_IGNORE) \
                \( -name include -o -name arch \) -prune -o \
-               -name '*.[chS]' -print; \
+               -name $1 -print; \
           for ARCH in $(ALLSOURCE_ARCHS) ; do \
                find $(__srctree)arch/$${ARCH} $(RCS_FIND_IGNORE) \
-                    -name '*.[chS]' -print; \
+                    -name $1 -print; \
           done ; \
           find $(__srctree)security/selinux/include $(RCS_FIND_IGNORE) \
-               -name '*.[chS]' -print; \
+               -name $1 -print; \
           find $(__srctree)include $(RCS_FIND_IGNORE) \
                \( -name config -o -name 'asm-*' \) -prune \
-               -o -name '*.[chS]' -print; \
+               -o -name $1 -print; \
           for ARCH in $(ALLINCLUDE_ARCHS) ; do \
                find $(__srctree)include/asm-$${ARCH} $(RCS_FIND_IGNORE) \
-                    -name '*.[chS]' -print; \
+                    -name $1 -print; \
           done ; \
           find $(__srctree)include/asm-generic $(RCS_FIND_IGNORE) \
-               -name '*.[chS]' -print )
+               -name $1 -print )
+endef
+
+define all-sources
+        $(call find-sources,'*.[chS]')
+endef
+define all-kconfigs
+        $(call find-sources,'Kconfig*')
+endef
+define all-defconfigs
+        $(call find-sources,'defconfig')
 endef
 
 quiet_cmd_cscope-file = FILELST cscope.files
@@ -1230,7 +1240,13 @@ define cmd_TAGS
                 echo "-I __initdata,__exitdata,__acquires,__releases  \
                       -I EXPORT_SYMBOL,EXPORT_SYMBOL_GPL              \
                       --extra=+f --c-kinds=+px"`;                     \
-                $(all-sources) | xargs etags $$ETAGSF -a
+                $(all-sources) | xargs etags $$ETAGSF -a;             \
+        if test "x$$ETAGSF" = x; then                                 \
+                $(all-kconfigs) | xargs etags -a                      \
+                --regex='/^config[ \t]+\([a-zA-Z0-9_]+\)/\1/';        \
+                $(all-defconfigs) | xargs etags -a                    \
+                --regex='/^#?[ \t]?\(CONFIG_[a-zA-Z0-9_]+\)/\1/';     \
+        fi
 endef
 
 TAGS: FORCE