diff --git a/[refs] b/[refs]
index 46d47edd0d10..38bc4f3367e9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 49490571bcfe24d279a66ba24198e8ba299fe58f
+refs/heads/master: 66d609ec8a4464b5fbe7a0723e3958b98c95991a
diff --git a/trunk/Makefile b/trunk/Makefile
index 06995fe7f57c..d01b004a2a0e 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -1203,9 +1203,15 @@ cscope: FORCE
 	$(call cmd,cscope)
 
 quiet_cmd_TAGS = MAKE   $@
-cmd_TAGS = $(all-sources) | etags -
+define cmd_TAGS
+	rm -f $@; \
+	ETAGSF=`etags --version | grep -i exuberant >/dev/null && echo "-I __initdata,__exitdata,EXPORT_SYMBOL,EXPORT_SYMBOL_GPL --extra=+f"`; \
+	$(all-sources) | xargs etags $$ETAGSF -a
+endef
+
+TAGS: FORCE
+	$(call cmd,TAGS)
 
-# 	Exuberant ctags works better with -I
 
 quiet_cmd_tags = MAKE   $@
 define cmd_tags
@@ -1214,9 +1220,6 @@ define cmd_tags
 	$(all-sources) | xargs ctags $$CTAGSF -a
 endef
 
-TAGS: FORCE
-	$(call cmd,TAGS)
-
 tags: FORCE
 	$(call cmd,tags)