i386/x86_64: move headers to include/asm-x86

Move the headers to include/asm-x86 and fixup the
header install make rules

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 9 insertions, 8 deletions

diff --git a/Makefile b/Makefile
index f2067e337d4d..2a30f5fd8294 100644
--- a/Makefile
+++ b/Makefile
@@ -863,7 +863,7 @@ ifneq ($(KBUILD_SRC),)
                 /bin/false; \
         fi;
         $(Q)if [ ! -d include2 ]; then mkdir -p include2; fi;
-        $(Q)ln -fsn $(srctree)/include/asm-$(ARCH) include2/asm
+        $(Q)ln -fsn $(srctree)/include/asm-$(SRCARCH) include2/asm
 endif
 
 # prepare2 creates a makefile if using a separate output directory
@@ -895,9 +895,9 @@ export CPPFLAGS_vmlinux.lds += -P -C -U$(ARCH)
 # before switching between archs anyway.
 
 include/asm:
-        @echo '  SYMLINK $@ -> include/asm-$(ARCH)'
+        @echo '  SYMLINK $@ -> include/asm-$(SRCARCH)'
         $(Q)if [ ! -d include ]; then mkdir -p include; fi;
-        @ln -fsn asm-$(ARCH) $@
+        @ln -fsn asm-$(SRCARCH) $@
 
 # Generate some files
 # ---------------------------------------------------------------------------
@@ -937,7 +937,8 @@ depend dep:
 INSTALL_HDR_PATH=$(objtree)/usr
 export INSTALL_HDR_PATH
 
-HDRARCHES=$(filter-out generic,$(patsubst $(srctree)/include/asm-%/Kbuild,%,$(wildcard $(srctree)/include/asm-*/Kbuild)))
+HDRFILTER=generic i386 x86_64
+HDRARCHES=$(filter-out $(HDRFILTER),$(patsubst $(srctree)/include/asm-%/Kbuild,%,$(wildcard $(srctree)/include/asm-*/Kbuild)))
 
 PHONY += headers_install_all
 headers_install_all: include/linux/version.h scripts_basic FORCE
@@ -948,11 +949,11 @@ headers_install_all: include/linux/version.h scripts_basic FORCE
 
 PHONY += headers_install
 headers_install: include/linux/version.h scripts_basic FORCE
-        @if [ ! -r $(srctree)/include/asm-$(ARCH)/Kbuild ]; then \
-          echo '*** Error: Headers not exportable for this architecture ($(ARCH))'; \
+        @if [ ! -r $(srctree)/include/asm-$(SRCARCH)/Kbuild ]; then \
+          echo '*** Error: Headers not exportable for this architecture ($(SRCARCH))'; \
           exit 1 ; fi
         $(Q)$(MAKE) $(build)=scripts scripts/unifdef
-        $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.headersinst obj=include
+        $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.headersinst ARCH=$(SRCARCH) obj=include
 
 PHONY += headers_check_all
 headers_check_all: headers_install_all
@@ -962,7 +963,7 @@ headers_check_all: headers_install_all
 
 PHONY += headers_check
 headers_check: headers_install
-        $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.headersinst obj=include HDRCHECK=1
+        $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.headersinst ARCH=$(SRCARCH) obj=include HDRCHECK=1
 
 # ---------------------------------------------------------------------------
 # Modules