From 10f59324d8b4a2e338bba99052e982f811f1aef2 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 11 Oct 2007 11:11:38 +0200
Subject: [PATCH] --- yaml --- r: 65338 b: refs/heads/master c:
 2eb4c95094d927f2eb094f720222cc5a9cc22fd3 h: refs/heads/master v: v3

---
 [refs]         |  2 +-
 trunk/Makefile | 11 ++++++++---
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 1d620bae707d..42aa39ce0320 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6752ed90da032af72f2f1fa23d1abf0889b56db0
+refs/heads/master: 2eb4c95094d927f2eb094f720222cc5a9cc22fd3
diff --git a/trunk/Makefile b/trunk/Makefile
index 61e178ff0c1b..f2067e337d4d 100644
--- a/trunk/Makefile
+++ b/trunk/Makefile
@@ -1293,18 +1293,23 @@ ifeq ($(ALLSOURCE_ARCHS),)
 ifeq ($(ARCH),um)
 ALLINCLUDE_ARCHS := $(ARCH) $(SUBARCH)
 else
-ALLINCLUDE_ARCHS := $(ARCH)
+ALLINCLUDE_ARCHS := $(SRCARCH)
 endif
 else
 #Allow user to specify only ALLSOURCE_PATHS on the command line, keeping existing behavour.
 ALLINCLUDE_ARCHS := $(ALLSOURCE_ARCHS)
 endif
 
+# Take care of arch/x86
+ifeq ($(ARCH), $(SRCARCH))
 ALLSOURCE_ARCHS := $(ARCH)
+else
+ALLSOURCE_ARCHS := $(ARCH) $(SRCARCH)
+endif
 
 define find-sources
         ( for ARCH in $(ALLSOURCE_ARCHS) ; do \
-	       find $(__srctree)arch/$${ARCH} $(RCS_FIND_IGNORE) \
+	       find $(__srctree)arch/$${SRCARCH} $(RCS_FIND_IGNORE) \
 	            -name $1 -print; \
 	  done ; \
 	  find $(__srctree)security/selinux/include $(RCS_FIND_IGNORE) \
@@ -1313,7 +1318,7 @@ define find-sources
 	       \( -name config -o -name 'asm-*' \) -prune \
 	       -o -name $1 -print; \
 	  for ARCH in $(ALLINCLUDE_ARCHS) ; do \
-	       find $(__srctree)include/asm-$${ARCH} $(RCS_FIND_IGNORE) \
+	       find $(__srctree)include/asm-$${SRCARCH} $(RCS_FIND_IGNORE) \
 	            -name $1 -print; \
 	  done ; \
 	  find $(__srctree)include/asm-generic $(RCS_FIND_IGNORE) \