From: Ian Campbell <ijc@hellion.org.uk>
Date: Tue, 28 Oct 2008 13:36:25 +0000 (+0000)
Subject: kbuild: do not include arch/<ARCH>/include/asm in find-sources twice.
X-Git-Tag: v2.6.28-rc3~34^2~1
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=de2addf592894b31b8149cca008f00d8102401e9;p=linux-2.6-omap-h63xx.git

kbuild: do not include arch/<ARCH>/include/asm in find-sources twice.

Architectures which have moved their includes to arch/<ARCH>/include
now list the headers twice in the source listing used by "make
cscope" and friends, causing those tools to list symbols twice.

Skipping these files in the ALLSOURCE_ARCHS pass rather than removing
the ALLINCLUDE_ARCHS pass preserves the semantics of the later.

Signed-off-by: Ian Campbell <ijc@hellion.org.uk>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
---

diff --git a/Makefile b/Makefile
index ffac7126c94..d50081751e0 100644
--- a/Makefile
+++ b/Makefile
@@ -1436,7 +1436,8 @@ ALLSOURCE_ARCHS := $(SRCARCH)
 define find-sources
         ( for arch in $(ALLSOURCE_ARCHS) ; do \
 	       find $(__srctree)arch/$${arch} $(RCS_FIND_IGNORE) \
-	            -name $1 -print; \
+		    -wholename $(__srctree)arch/$${arch}/include/asm -type d -prune \
+	            -o -name $1 -print; \
 	  done ; \
 	  find $(__srctree)security/selinux/include $(RCS_FIND_IGNORE) \
 	       -name $1 -print; \