--- linux-2.6.16/Makefile.orig	2006-03-24 10:08:05.000000000 -0500
+++ linux-2.6.16/Makefile	2006-03-24 10:08:30.000000000 -0500
@@ -1202,7 +1202,7 @@
 #Adding $(srctree) adds about 20M on i386 to the size of the output file!
 
 ifeq ($(src),$(obj))
-__srctree =
+__srctree = ./
 else
 __srctree = $(srctree)/
 endif
@@ -1222,8 +1222,12 @@
 
 define all-sources
 	( find $(__srctree) $(RCS_FIND_IGNORE) \
-	       \( -name include -o -name arch \) -prune -o \
+	       \( -path $(__srctree)include -o -path $(__srctree)arch -o \
+	          -path $(__srctree)mm \) -prune -o \
 	       -name '*.[chS]' -print; \
+	  find $(__srctree)mm $(RCS_FIND_IGNORE) \
+	       \( -name nommu.c \) -prune \
+	       -o -name '*.[chS]' -print; \
 	  for ARCH in $(ALLSOURCE_ARCHS) ; do \
 	       find $(__srctree)arch/$${ARCH} $(RCS_FIND_IGNORE) \
 	            -name '*.[chS]' -print; \
@@ -1268,11 +1272,10 @@
 quiet_cmd_tags = MAKE   $@
 define cmd_tags
 	rm -f $@; \
-	CTAGSF=`ctags --version | grep -i exuberant >/dev/null &&     \
-                echo "-I __initdata,__exitdata,__acquires,__releases  \
-                      -I EXPORT_SYMBOL,EXPORT_SYMBOL_GPL              \
-                      --extra=+f --c-kinds=+px"`;                     \
-                $(all-sources) | xargs ctags $$CTAGSF -a
+	ignorefile=../ctags-ignore ; sortprog=sort-tags ; sort=cat ;\
+	[ -f $$ignorefile ] && ignore=-I$$ignorefile ;\
+	hash $$sortprog 2>/dev/null && sort=$$sortprog ;\
+	$(all-sources) | ctags $$ignore -L - -f - | $$sort > tags
 endef
 
 tags: FORCE