x86, um: ... and asm-x86 move

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>

diff --git a/arch/ia64/ia32/audit.c b/arch/ia64/ia32/audit.c
index 5e901c75df1bda93122aef924613d8a173cb722f..5c93ddd1e42d414066042ec8e876eba7471b551c 100644 (file)
--- a/arch/ia64/ia32/audit.c
+++ b/arch/ia64/ia32/audit.c
@@ -1,4 +1,4 @@
-#include <asm-x86/unistd_32.h>
+#include "../../x86/include/asm/unistd_32.h"
 
 unsigned ia32_dir_class[] = {
 #include <asm-generic/audit_dir_write.h>

diff --git a/arch/um/Makefile b/arch/um/Makefile
index 94fb24ea5afaf9f7184ac1f695cd7d0d0a4b0b70..4fc79f3030e4e92d57029be01ce0afcdee3b874c 100644 (file)
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -156,9 +156,9 @@ $(ARCH_DIR)/include/asm/arch:
        @echo '  SYMLINK $@'
 ifneq ($(KBUILD_SRC),)
        $(Q)mkdir -p $(objtree)/$(ARCH_DIR)/include/asm
-       $(Q)ln -fsn $(srctree)/include/asm-$(HEADER_ARCH) $@
+       $(Q)ln -fsn $(srctree)/arch/$(HEADER_ARCH)/include/asm $@
 else
-       $(Q)ln -fsn ../../../../include/asm-$(HEADER_ARCH) $@
+       $(Q)ln -fsn ../../../$(HEADER_ARCH)/include/asm $@
 endif
 
 $(objtree)/$(ARCH_DIR)/include/shared:

diff --git a/arch/um/sys-x86_64/syscall_table.c b/arch/um/sys-x86_64/syscall_table.c
index 32f5fbe2d0d2fe2aca4a7f3b5eeec80b3eb6d87d..ef42ec01eaff37692d1f861a4c1966a2c718e72d 100644 (file)
--- a/arch/um/sys-x86_64/syscall_table.c
+++ b/arch/um/sys-x86_64/syscall_table.c
@@ -42,7 +42,7 @@
 
 #define __SYSCALL(nr, sym) extern asmlinkage void sym(void) ;
 #undef ASM_X86__UNISTD_64_H
-#include <asm-x86/unistd_64.h>
+#include "../../x86/include/asm/unistd_64.h"
 
 #undef __SYSCALL
 #define __SYSCALL(nr, sym) [ nr ] = sym,
@@ -64,7 +64,7 @@ extern void sys_ni_syscall(void);
  */
 
 sys_call_ptr_t sys_call_table[] __cacheline_aligned = {
-#include <asm-x86/unistd_64.h>
+#include "../../x86/include/asm/unistd_64.h"
 };
 
 int syscall_table_size = sizeof(sys_call_table);

diff --git a/arch/x86/Makefile b/arch/x86/Makefile
index f5631da585b69ac1722891bc0bee1e63a1ec652c..d1a47adb5aec0b14cfd6b52297be80f87fbf0682 100644 (file)
--- a/arch/x86/Makefile
+++ b/arch/x86/Makefile
@@ -110,16 +110,16 @@ KBUILD_CFLAGS += $(call cc-option,-mno-sse -mno-mmx -mno-sse2 -mno-3dnow,)
 mcore-y  := arch/x86/mach-default/
 
 # Voyager subarch support
-mflags-$(CONFIG_X86_VOYAGER)   := -Iinclude/asm-x86/mach-voyager
+mflags-$(CONFIG_X86_VOYAGER)   := -Iarch/x86/include/asm/mach-voyager
 mcore-$(CONFIG_X86_VOYAGER)    := arch/x86/mach-voyager/
 
 # generic subarchitecture
-mflags-$(CONFIG_X86_GENERICARCH):= -Iinclude/asm-x86/mach-generic
+mflags-$(CONFIG_X86_GENERICARCH):= -Iarch/x86/include/asm/mach-generic
 fcore-$(CONFIG_X86_GENERICARCH)        += arch/x86/mach-generic/
 mcore-$(CONFIG_X86_GENERICARCH)        := arch/x86/mach-default/
 
 # default subarch .h files
-mflags-y += -Iinclude/asm-x86/mach-default
+mflags-y += -Iarch/x86/include/asm/mach-default
 
 # 64 bit does not support subarch support - clear sub arch variables
 fcore-$(CONFIG_X86_64)  :=

diff --git a/include/asm-x86/Kbuild b/arch/x86/include/asm/Kbuild
similarity index 100%
rename from include/asm-x86/Kbuild
rename to arch/x86/include/asm/Kbuild

diff --git a/include/asm-x86/a.out-core.h b/arch/x86/include/asm/a.out-core.h
similarity index 100%
rename from include/asm-x86/a.out-core.h
rename to arch/x86/include/asm/a.out-core.h

diff --git a/include/asm-x86/a.out.h b/arch/x86/include/asm/a.out.h
similarity index 100%
rename from include/asm-x86/a.out.h
rename to arch/x86/include/asm/a.out.h

diff --git a/include/asm-x86/acpi.h b/arch/x86/include/asm/acpi.h
similarity index 100%
rename from include/asm-x86/acpi.h
rename to arch/x86/include/asm/acpi.h

diff --git a/include/asm-x86/agp.h b/arch/x86/include/asm/agp.h
similarity index 100%
rename from include/asm-x86/agp.h
rename to arch/x86/include/asm/agp.h

diff --git a/include/asm-x86/alternative-asm.h b/arch/x86/include/asm/alternative-asm.h
similarity index 100%
rename from include/asm-x86/alternative-asm.h
rename to arch/x86/include/asm/alternative-asm.h

diff --git a/include/asm-x86/alternative.h b/arch/x86/include/asm/alternative.h
similarity index 100%
rename from include/asm-x86/alternative.h
rename to arch/x86/include/asm/alternative.h

diff --git a/include/asm-x86/amd_iommu.h b/arch/x86/include/asm/amd_iommu.h
similarity index 100%
rename from include/asm-x86/amd_iommu.h
rename to arch/x86/include/asm/amd_iommu.h

diff --git a/include/asm-x86/amd_iommu_types.h b/arch/x86/include/asm/amd_iommu_types.h
similarity index 100%
rename from include/asm-x86/amd_iommu_types.h
rename to arch/x86/include/asm/amd_iommu_types.h

diff --git a/include/asm-x86/apic.h b/arch/x86/include/asm/apic.h
similarity index 100%
rename from include/asm-x86/apic.h
rename to arch/x86/include/asm/apic.h

diff --git a/include/asm-x86/apicdef.h b/arch/x86/include/asm/apicdef.h
similarity index 100%
rename from include/asm-x86/apicdef.h
rename to arch/x86/include/asm/apicdef.h

diff --git a/include/asm-x86/arch_hooks.h b/arch/x86/include/asm/arch_hooks.h
similarity index 100%
rename from include/asm-x86/arch_hooks.h
rename to arch/x86/include/asm/arch_hooks.h

diff --git a/include/asm-x86/asm.h b/arch/x86/include/asm/asm.h
similarity index 100%
rename from include/asm-x86/asm.h
rename to arch/x86/include/asm/asm.h

diff --git a/include/asm-x86/atomic.h b/arch/x86/include/asm/atomic.h
similarity index 100%
rename from include/asm-x86/atomic.h
rename to arch/x86/include/asm/atomic.h

diff --git a/include/asm-x86/atomic_32.h b/arch/x86/include/asm/atomic_32.h
similarity index 100%
rename from include/asm-x86/atomic_32.h
rename to arch/x86/include/asm/atomic_32.h

diff --git a/include/asm-x86/atomic_64.h b/arch/x86/include/asm/atomic_64.h
similarity index 100%
rename from include/asm-x86/atomic_64.h
rename to arch/x86/include/asm/atomic_64.h

diff --git a/include/asm-x86/auxvec.h b/arch/x86/include/asm/auxvec.h
similarity index 100%
rename from include/asm-x86/auxvec.h
rename to arch/x86/include/asm/auxvec.h

diff --git a/include/asm-x86/bigsmp/apic.h b/arch/x86/include/asm/bigsmp/apic.h
similarity index 100%
rename from include/asm-x86/bigsmp/apic.h
rename to arch/x86/include/asm/bigsmp/apic.h

diff --git a/include/asm-x86/bigsmp/apicdef.h b/arch/x86/include/asm/bigsmp/apicdef.h
similarity index 100%
rename from include/asm-x86/bigsmp/apicdef.h
rename to arch/x86/include/asm/bigsmp/apicdef.h

diff --git a/include/asm-x86/bigsmp/ipi.h b/arch/x86/include/asm/bigsmp/ipi.h
similarity index 100%
rename from include/asm-x86/bigsmp/ipi.h
rename to arch/x86/include/asm/bigsmp/ipi.h

diff --git a/include/asm-x86/bios_ebda.h b/arch/x86/include/asm/bios_ebda.h
similarity index 100%
rename from include/asm-x86/bios_ebda.h
rename to arch/x86/include/asm/bios_ebda.h

diff --git a/include/asm-x86/bitops.h b/arch/x86/include/asm/bitops.h
similarity index 100%
rename from include/asm-x86/bitops.h
rename to arch/x86/include/asm/bitops.h

diff --git a/include/asm-x86/boot.h b/arch/x86/include/asm/boot.h
similarity index 100%
rename from include/asm-x86/boot.h
rename to arch/x86/include/asm/boot.h

diff --git a/include/asm-x86/bootparam.h b/arch/x86/include/asm/bootparam.h
similarity index 100%
rename from include/asm-x86/bootparam.h
rename to arch/x86/include/asm/bootparam.h

diff --git a/include/asm-x86/bug.h b/arch/x86/include/asm/bug.h
similarity index 100%
rename from include/asm-x86/bug.h
rename to arch/x86/include/asm/bug.h

diff --git a/include/asm-x86/bugs.h b/arch/x86/include/asm/bugs.h
similarity index 100%
rename from include/asm-x86/bugs.h
rename to arch/x86/include/asm/bugs.h

diff --git a/include/asm-x86/byteorder.h b/arch/x86/include/asm/byteorder.h
similarity index 100%
rename from include/asm-x86/byteorder.h
rename to arch/x86/include/asm/byteorder.h

diff --git a/include/asm-x86/cache.h b/arch/x86/include/asm/cache.h
similarity index 100%
rename from include/asm-x86/cache.h
rename to arch/x86/include/asm/cache.h

diff --git a/include/asm-x86/cacheflush.h b/arch/x86/include/asm/cacheflush.h
similarity index 100%
rename from include/asm-x86/cacheflush.h
rename to arch/x86/include/asm/cacheflush.h

diff --git a/include/asm-x86/calgary.h b/arch/x86/include/asm/calgary.h
similarity index 100%
rename from include/asm-x86/calgary.h
rename to arch/x86/include/asm/calgary.h

diff --git a/include/asm-x86/calling.h b/arch/x86/include/asm/calling.h
similarity index 100%
rename from include/asm-x86/calling.h
rename to arch/x86/include/asm/calling.h

diff --git a/include/asm-x86/checksum.h b/arch/x86/include/asm/checksum.h
similarity index 100%
rename from include/asm-x86/checksum.h
rename to arch/x86/include/asm/checksum.h

diff --git a/include/asm-x86/checksum_32.h b/arch/x86/include/asm/checksum_32.h
similarity index 100%
rename from include/asm-x86/checksum_32.h
rename to arch/x86/include/asm/checksum_32.h

diff --git a/include/asm-x86/checksum_64.h b/arch/x86/include/asm/checksum_64.h
similarity index 100%
rename from include/asm-x86/checksum_64.h
rename to arch/x86/include/asm/checksum_64.h

diff --git a/include/asm-x86/cmpxchg.h b/arch/x86/include/asm/cmpxchg.h
similarity index 100%
rename from include/asm-x86/cmpxchg.h
rename to arch/x86/include/asm/cmpxchg.h

diff --git a/include/asm-x86/cmpxchg_32.h b/arch/x86/include/asm/cmpxchg_32.h
similarity index 100%
rename from include/asm-x86/cmpxchg_32.h
rename to arch/x86/include/asm/cmpxchg_32.h

diff --git a/include/asm-x86/cmpxchg_64.h b/arch/x86/include/asm/cmpxchg_64.h
similarity index 100%
rename from include/asm-x86/cmpxchg_64.h
rename to arch/x86/include/asm/cmpxchg_64.h

diff --git a/include/asm-x86/compat.h b/arch/x86/include/asm/compat.h
similarity index 100%
rename from include/asm-x86/compat.h
rename to arch/x86/include/asm/compat.h

diff --git a/include/asm-x86/cpu.h b/arch/x86/include/asm/cpu.h
similarity index 100%
rename from include/asm-x86/cpu.h
rename to arch/x86/include/asm/cpu.h

diff --git a/include/asm-x86/cpufeature.h b/arch/x86/include/asm/cpufeature.h
similarity index 100%
rename from include/asm-x86/cpufeature.h
rename to arch/x86/include/asm/cpufeature.h

diff --git a/include/asm-x86/cputime.h b/arch/x86/include/asm/cputime.h
similarity index 100%
rename from include/asm-x86/cputime.h
rename to arch/x86/include/asm/cputime.h

diff --git a/include/asm-x86/current.h b/arch/x86/include/asm/current.h
similarity index 100%
rename from include/asm-x86/current.h
rename to arch/x86/include/asm/current.h

diff --git a/include/asm-x86/debugreg.h b/arch/x86/include/asm/debugreg.h
similarity index 100%
rename from include/asm-x86/debugreg.h
rename to arch/x86/include/asm/debugreg.h

diff --git a/include/asm-x86/delay.h b/arch/x86/include/asm/delay.h
similarity index 100%
rename from include/asm-x86/delay.h
rename to arch/x86/include/asm/delay.h

diff --git a/include/asm-x86/desc.h b/arch/x86/include/asm/desc.h
similarity index 100%
rename from include/asm-x86/desc.h
rename to arch/x86/include/asm/desc.h

diff --git a/include/asm-x86/desc_defs.h b/arch/x86/include/asm/desc_defs.h
similarity index 100%
rename from include/asm-x86/desc_defs.h
rename to arch/x86/include/asm/desc_defs.h

diff --git a/include/asm-x86/device.h b/arch/x86/include/asm/device.h
similarity index 100%
rename from include/asm-x86/device.h
rename to arch/x86/include/asm/device.h

diff --git a/include/asm-x86/div64.h b/arch/x86/include/asm/div64.h
similarity index 100%
rename from include/asm-x86/div64.h
rename to arch/x86/include/asm/div64.h

diff --git a/include/asm-x86/dma-mapping.h b/arch/x86/include/asm/dma-mapping.h
similarity index 100%
rename from include/asm-x86/dma-mapping.h
rename to arch/x86/include/asm/dma-mapping.h

diff --git a/include/asm-x86/dma.h b/arch/x86/include/asm/dma.h
similarity index 100%
rename from include/asm-x86/dma.h
rename to arch/x86/include/asm/dma.h

diff --git a/include/asm-x86/dmi.h b/arch/x86/include/asm/dmi.h
similarity index 100%
rename from include/asm-x86/dmi.h
rename to arch/x86/include/asm/dmi.h

diff --git a/include/asm-x86/ds.h b/arch/x86/include/asm/ds.h
similarity index 100%
rename from include/asm-x86/ds.h
rename to arch/x86/include/asm/ds.h

diff --git a/include/asm-x86/dwarf2.h b/arch/x86/include/asm/dwarf2.h
similarity index 100%
rename from include/asm-x86/dwarf2.h
rename to arch/x86/include/asm/dwarf2.h

diff --git a/include/asm-x86/e820.h b/arch/x86/include/asm/e820.h
similarity index 100%
rename from include/asm-x86/e820.h
rename to arch/x86/include/asm/e820.h

diff --git a/include/asm-x86/edac.h b/arch/x86/include/asm/edac.h
similarity index 100%
rename from include/asm-x86/edac.h
rename to arch/x86/include/asm/edac.h

diff --git a/include/asm-x86/efi.h b/arch/x86/include/asm/efi.h
similarity index 100%
rename from include/asm-x86/efi.h
rename to arch/x86/include/asm/efi.h

diff --git a/include/asm-x86/elf.h b/arch/x86/include/asm/elf.h
similarity index 100%
rename from include/asm-x86/elf.h
rename to arch/x86/include/asm/elf.h

diff --git a/include/asm-x86/emergency-restart.h b/arch/x86/include/asm/emergency-restart.h
similarity index 100%
rename from include/asm-x86/emergency-restart.h
rename to arch/x86/include/asm/emergency-restart.h

diff --git a/include/asm-x86/errno.h b/arch/x86/include/asm/errno.h
similarity index 100%
rename from include/asm-x86/errno.h
rename to arch/x86/include/asm/errno.h

diff --git a/include/asm-x86/es7000/apic.h b/arch/x86/include/asm/es7000/apic.h
similarity index 100%
rename from include/asm-x86/es7000/apic.h
rename to arch/x86/include/asm/es7000/apic.h

diff --git a/include/asm-x86/es7000/apicdef.h b/arch/x86/include/asm/es7000/apicdef.h
similarity index 100%
rename from include/asm-x86/es7000/apicdef.h
rename to arch/x86/include/asm/es7000/apicdef.h

diff --git a/include/asm-x86/es7000/ipi.h b/arch/x86/include/asm/es7000/ipi.h
similarity index 100%
rename from include/asm-x86/es7000/ipi.h
rename to arch/x86/include/asm/es7000/ipi.h

diff --git a/include/asm-x86/es7000/mpparse.h b/arch/x86/include/asm/es7000/mpparse.h
similarity index 100%
rename from include/asm-x86/es7000/mpparse.h
rename to arch/x86/include/asm/es7000/mpparse.h

diff --git a/include/asm-x86/es7000/wakecpu.h b/arch/x86/include/asm/es7000/wakecpu.h
similarity index 100%
rename from include/asm-x86/es7000/wakecpu.h
rename to arch/x86/include/asm/es7000/wakecpu.h

diff --git a/include/asm-x86/fb.h b/arch/x86/include/asm/fb.h
similarity index 100%
rename from include/asm-x86/fb.h
rename to arch/x86/include/asm/fb.h

diff --git a/include/asm-x86/fcntl.h b/arch/x86/include/asm/fcntl.h
similarity index 100%
rename from include/asm-x86/fcntl.h
rename to arch/x86/include/asm/fcntl.h

diff --git a/include/asm-x86/fixmap.h b/arch/x86/include/asm/fixmap.h
similarity index 100%
rename from include/asm-x86/fixmap.h
rename to arch/x86/include/asm/fixmap.h

diff --git a/include/asm-x86/fixmap_32.h b/arch/x86/include/asm/fixmap_32.h
similarity index 100%
rename from include/asm-x86/fixmap_32.h
rename to arch/x86/include/asm/fixmap_32.h

diff --git a/include/asm-x86/fixmap_64.h b/arch/x86/include/asm/fixmap_64.h
similarity index 100%
rename from include/asm-x86/fixmap_64.h
rename to arch/x86/include/asm/fixmap_64.h

diff --git a/include/asm-x86/floppy.h b/arch/x86/include/asm/floppy.h
similarity index 100%
rename from include/asm-x86/floppy.h
rename to arch/x86/include/asm/floppy.h

diff --git a/include/asm-x86/frame.h b/arch/x86/include/asm/frame.h
similarity index 100%
rename from include/asm-x86/frame.h
rename to arch/x86/include/asm/frame.h

diff --git a/include/asm-x86/ftrace.h b/arch/x86/include/asm/ftrace.h
similarity index 100%
rename from include/asm-x86/ftrace.h
rename to arch/x86/include/asm/ftrace.h

diff --git a/include/asm-x86/futex.h b/arch/x86/include/asm/futex.h
similarity index 100%
rename from include/asm-x86/futex.h
rename to arch/x86/include/asm/futex.h

diff --git a/include/asm-x86/gart.h b/arch/x86/include/asm/gart.h
similarity index 100%
rename from include/asm-x86/gart.h
rename to arch/x86/include/asm/gart.h

diff --git a/include/asm-x86/genapic.h b/arch/x86/include/asm/genapic.h
similarity index 100%
rename from include/asm-x86/genapic.h
rename to arch/x86/include/asm/genapic.h

diff --git a/include/asm-x86/genapic_32.h b/arch/x86/include/asm/genapic_32.h
similarity index 100%
rename from include/asm-x86/genapic_32.h
rename to arch/x86/include/asm/genapic_32.h

diff --git a/include/asm-x86/genapic_64.h b/arch/x86/include/asm/genapic_64.h
similarity index 100%
rename from include/asm-x86/genapic_64.h
rename to arch/x86/include/asm/genapic_64.h

diff --git a/include/asm-x86/geode.h b/arch/x86/include/asm/geode.h
similarity index 100%
rename from include/asm-x86/geode.h
rename to arch/x86/include/asm/geode.h

diff --git a/include/asm-x86/gpio.h b/arch/x86/include/asm/gpio.h
similarity index 100%
rename from include/asm-x86/gpio.h
rename to arch/x86/include/asm/gpio.h

diff --git a/include/asm-x86/hardirq.h b/arch/x86/include/asm/hardirq.h
similarity index 100%
rename from include/asm-x86/hardirq.h
rename to arch/x86/include/asm/hardirq.h

diff --git a/include/asm-x86/hardirq_32.h b/arch/x86/include/asm/hardirq_32.h
similarity index 100%
rename from include/asm-x86/hardirq_32.h
rename to arch/x86/include/asm/hardirq_32.h

diff --git a/include/asm-x86/hardirq_64.h b/arch/x86/include/asm/hardirq_64.h
similarity index 100%
rename from include/asm-x86/hardirq_64.h
rename to arch/x86/include/asm/hardirq_64.h

diff --git a/include/asm-x86/highmem.h b/arch/x86/include/asm/highmem.h
similarity index 100%
rename from include/asm-x86/highmem.h
rename to arch/x86/include/asm/highmem.h

diff --git a/include/asm-x86/hpet.h b/arch/x86/include/asm/hpet.h
similarity index 100%
rename from include/asm-x86/hpet.h
rename to arch/x86/include/asm/hpet.h

diff --git a/include/asm-x86/hugetlb.h b/arch/x86/include/asm/hugetlb.h
similarity index 100%
rename from include/asm-x86/hugetlb.h
rename to arch/x86/include/asm/hugetlb.h

diff --git a/include/asm-x86/hw_irq.h b/arch/x86/include/asm/hw_irq.h
similarity index 100%
rename from include/asm-x86/hw_irq.h
rename to arch/x86/include/asm/hw_irq.h

diff --git a/include/asm-x86/hypertransport.h b/arch/x86/include/asm/hypertransport.h
similarity index 100%
rename from include/asm-x86/hypertransport.h
rename to arch/x86/include/asm/hypertransport.h

diff --git a/include/asm-x86/i387.h b/arch/x86/include/asm/i387.h
similarity index 100%
rename from include/asm-x86/i387.h
rename to arch/x86/include/asm/i387.h

diff --git a/include/asm-x86/i8253.h b/arch/x86/include/asm/i8253.h
similarity index 100%
rename from include/asm-x86/i8253.h
rename to arch/x86/include/asm/i8253.h

diff --git a/include/asm-x86/i8259.h b/arch/x86/include/asm/i8259.h
similarity index 100%
rename from include/asm-x86/i8259.h
rename to arch/x86/include/asm/i8259.h

diff --git a/include/asm-x86/ia32.h b/arch/x86/include/asm/ia32.h
similarity index 100%
rename from include/asm-x86/ia32.h
rename to arch/x86/include/asm/ia32.h

diff --git a/include/asm-x86/ia32_unistd.h b/arch/x86/include/asm/ia32_unistd.h
similarity index 100%
rename from include/asm-x86/ia32_unistd.h
rename to arch/x86/include/asm/ia32_unistd.h

diff --git a/include/asm-x86/idle.h b/arch/x86/include/asm/idle.h
similarity index 100%
rename from include/asm-x86/idle.h
rename to arch/x86/include/asm/idle.h

diff --git a/include/asm-x86/intel_arch_perfmon.h b/arch/x86/include/asm/intel_arch_perfmon.h
similarity index 100%
rename from include/asm-x86/intel_arch_perfmon.h
rename to arch/x86/include/asm/intel_arch_perfmon.h

diff --git a/include/asm-x86/io.h b/arch/x86/include/asm/io.h
similarity index 100%
rename from include/asm-x86/io.h
rename to arch/x86/include/asm/io.h

diff --git a/include/asm-x86/io_32.h b/arch/x86/include/asm/io_32.h
similarity index 100%
rename from include/asm-x86/io_32.h
rename to arch/x86/include/asm/io_32.h

diff --git a/include/asm-x86/io_64.h b/arch/x86/include/asm/io_64.h
similarity index 100%
rename from include/asm-x86/io_64.h
rename to arch/x86/include/asm/io_64.h

diff --git a/include/asm-x86/io_apic.h b/arch/x86/include/asm/io_apic.h
similarity index 100%
rename from include/asm-x86/io_apic.h
rename to arch/x86/include/asm/io_apic.h

diff --git a/include/asm-x86/ioctl.h b/arch/x86/include/asm/ioctl.h
similarity index 100%
rename from include/asm-x86/ioctl.h
rename to arch/x86/include/asm/ioctl.h

diff --git a/include/asm-x86/ioctls.h b/arch/x86/include/asm/ioctls.h
similarity index 100%
rename from include/asm-x86/ioctls.h
rename to arch/x86/include/asm/ioctls.h

diff --git a/include/asm-x86/iommu.h b/arch/x86/include/asm/iommu.h
similarity index 100%
rename from include/asm-x86/iommu.h
rename to arch/x86/include/asm/iommu.h

diff --git a/include/asm-x86/ipcbuf.h b/arch/x86/include/asm/ipcbuf.h
similarity index 100%
rename from include/asm-x86/ipcbuf.h
rename to arch/x86/include/asm/ipcbuf.h

diff --git a/include/asm-x86/ipi.h b/arch/x86/include/asm/ipi.h
similarity index 100%
rename from include/asm-x86/ipi.h
rename to arch/x86/include/asm/ipi.h

diff --git a/include/asm-x86/irq.h b/arch/x86/include/asm/irq.h
similarity index 100%
rename from include/asm-x86/irq.h
rename to arch/x86/include/asm/irq.h

diff --git a/include/asm-x86/irq_regs.h b/arch/x86/include/asm/irq_regs.h
similarity index 100%
rename from include/asm-x86/irq_regs.h
rename to arch/x86/include/asm/irq_regs.h

diff --git a/include/asm-x86/irq_regs_32.h b/arch/x86/include/asm/irq_regs_32.h
similarity index 100%
rename from include/asm-x86/irq_regs_32.h
rename to arch/x86/include/asm/irq_regs_32.h

diff --git a/include/asm-x86/irq_regs_64.h b/arch/x86/include/asm/irq_regs_64.h
similarity index 100%
rename from include/asm-x86/irq_regs_64.h
rename to arch/x86/include/asm/irq_regs_64.h

diff --git a/include/asm-x86/irq_remapping.h b/arch/x86/include/asm/irq_remapping.h
similarity index 100%
rename from include/asm-x86/irq_remapping.h
rename to arch/x86/include/asm/irq_remapping.h

diff --git a/include/asm-x86/irq_vectors.h b/arch/x86/include/asm/irq_vectors.h
similarity index 100%
rename from include/asm-x86/irq_vectors.h
rename to arch/x86/include/asm/irq_vectors.h

diff --git a/include/asm-x86/irqflags.h b/arch/x86/include/asm/irqflags.h
similarity index 100%
rename from include/asm-x86/irqflags.h
rename to arch/x86/include/asm/irqflags.h

diff --git a/include/asm-x86/ist.h b/arch/x86/include/asm/ist.h
similarity index 100%
rename from include/asm-x86/ist.h
rename to arch/x86/include/asm/ist.h

diff --git a/include/asm-x86/k8.h b/arch/x86/include/asm/k8.h
similarity index 100%
rename from include/asm-x86/k8.h
rename to arch/x86/include/asm/k8.h

diff --git a/include/asm-x86/kdebug.h b/arch/x86/include/asm/kdebug.h
similarity index 100%
rename from include/asm-x86/kdebug.h
rename to arch/x86/include/asm/kdebug.h

diff --git a/include/asm-x86/kexec.h b/arch/x86/include/asm/kexec.h
similarity index 100%
rename from include/asm-x86/kexec.h
rename to arch/x86/include/asm/kexec.h

diff --git a/include/asm-x86/kgdb.h b/arch/x86/include/asm/kgdb.h
similarity index 100%
rename from include/asm-x86/kgdb.h
rename to arch/x86/include/asm/kgdb.h

diff --git a/include/asm-x86/kmap_types.h b/arch/x86/include/asm/kmap_types.h
similarity index 100%
rename from include/asm-x86/kmap_types.h
rename to arch/x86/include/asm/kmap_types.h

diff --git a/include/asm-x86/kprobes.h b/arch/x86/include/asm/kprobes.h
similarity index 100%
rename from include/asm-x86/kprobes.h
rename to arch/x86/include/asm/kprobes.h

diff --git a/include/asm-x86/kvm.h b/arch/x86/include/asm/kvm.h
similarity index 100%
rename from include/asm-x86/kvm.h
rename to arch/x86/include/asm/kvm.h

diff --git a/include/asm-x86/kvm_host.h b/arch/x86/include/asm/kvm_host.h
similarity index 100%
rename from include/asm-x86/kvm_host.h
rename to arch/x86/include/asm/kvm_host.h

diff --git a/include/asm-x86/kvm_para.h b/arch/x86/include/asm/kvm_para.h
similarity index 100%
rename from include/asm-x86/kvm_para.h
rename to arch/x86/include/asm/kvm_para.h

diff --git a/include/asm-x86/kvm_x86_emulate.h b/arch/x86/include/asm/kvm_x86_emulate.h
similarity index 100%
rename from include/asm-x86/kvm_x86_emulate.h
rename to arch/x86/include/asm/kvm_x86_emulate.h

diff --git a/include/asm-x86/ldt.h b/arch/x86/include/asm/ldt.h
similarity index 100%
rename from include/asm-x86/ldt.h
rename to arch/x86/include/asm/ldt.h

diff --git a/include/asm-x86/lguest.h b/arch/x86/include/asm/lguest.h
similarity index 100%
rename from include/asm-x86/lguest.h
rename to arch/x86/include/asm/lguest.h

diff --git a/include/asm-x86/lguest_hcall.h b/arch/x86/include/asm/lguest_hcall.h
similarity index 100%
rename from include/asm-x86/lguest_hcall.h
rename to arch/x86/include/asm/lguest_hcall.h

diff --git a/include/asm-x86/linkage.h b/arch/x86/include/asm/linkage.h
similarity index 100%
rename from include/asm-x86/linkage.h
rename to arch/x86/include/asm/linkage.h

diff --git a/include/asm-x86/local.h b/arch/x86/include/asm/local.h
similarity index 100%
rename from include/asm-x86/local.h
rename to arch/x86/include/asm/local.h

diff --git a/include/asm-x86/mach-default/apm.h b/arch/x86/include/asm/mach-default/apm.h
similarity index 100%
rename from include/asm-x86/mach-default/apm.h
rename to arch/x86/include/asm/mach-default/apm.h

diff --git a/include/asm-x86/mach-default/do_timer.h b/arch/x86/include/asm/mach-default/do_timer.h
similarity index 100%
rename from include/asm-x86/mach-default/do_timer.h
rename to arch/x86/include/asm/mach-default/do_timer.h

diff --git a/include/asm-x86/mach-default/entry_arch.h b/arch/x86/include/asm/mach-default/entry_arch.h
similarity index 100%
rename from include/asm-x86/mach-default/entry_arch.h
rename to arch/x86/include/asm/mach-default/entry_arch.h

diff --git a/include/asm-x86/mach-default/mach_apic.h b/arch/x86/include/asm/mach-default/mach_apic.h
similarity index 100%
rename from include/asm-x86/mach-default/mach_apic.h
rename to arch/x86/include/asm/mach-default/mach_apic.h

diff --git a/include/asm-x86/mach-default/mach_apicdef.h b/arch/x86/include/asm/mach-default/mach_apicdef.h
similarity index 100%
rename from include/asm-x86/mach-default/mach_apicdef.h
rename to arch/x86/include/asm/mach-default/mach_apicdef.h

diff --git a/include/asm-x86/mach-default/mach_ipi.h b/arch/x86/include/asm/mach-default/mach_ipi.h
similarity index 100%
rename from include/asm-x86/mach-default/mach_ipi.h
rename to arch/x86/include/asm/mach-default/mach_ipi.h

diff --git a/include/asm-x86/mach-default/mach_mpparse.h b/arch/x86/include/asm/mach-default/mach_mpparse.h
similarity index 100%
rename from include/asm-x86/mach-default/mach_mpparse.h
rename to arch/x86/include/asm/mach-default/mach_mpparse.h

diff --git a/include/asm-x86/mach-default/mach_mpspec.h b/arch/x86/include/asm/mach-default/mach_mpspec.h
similarity index 100%
rename from include/asm-x86/mach-default/mach_mpspec.h
rename to arch/x86/include/asm/mach-default/mach_mpspec.h

diff --git a/include/asm-x86/mach-default/mach_timer.h b/arch/x86/include/asm/mach-default/mach_timer.h
similarity index 100%
rename from include/asm-x86/mach-default/mach_timer.h
rename to arch/x86/include/asm/mach-default/mach_timer.h

diff --git a/include/asm-x86/mach-default/mach_traps.h b/arch/x86/include/asm/mach-default/mach_traps.h
similarity index 100%
rename from include/asm-x86/mach-default/mach_traps.h
rename to arch/x86/include/asm/mach-default/mach_traps.h

diff --git a/include/asm-x86/mach-default/mach_wakecpu.h b/arch/x86/include/asm/mach-default/mach_wakecpu.h
similarity index 100%
rename from include/asm-x86/mach-default/mach_wakecpu.h
rename to arch/x86/include/asm/mach-default/mach_wakecpu.h

diff --git a/include/asm-x86/mach-default/pci-functions.h b/arch/x86/include/asm/mach-default/pci-functions.h
similarity index 100%
rename from include/asm-x86/mach-default/pci-functions.h
rename to arch/x86/include/asm/mach-default/pci-functions.h

diff --git a/include/asm-x86/mach-default/setup_arch.h b/arch/x86/include/asm/mach-default/setup_arch.h
similarity index 100%
rename from include/asm-x86/mach-default/setup_arch.h
rename to arch/x86/include/asm/mach-default/setup_arch.h

diff --git a/include/asm-x86/mach-default/smpboot_hooks.h b/arch/x86/include/asm/mach-default/smpboot_hooks.h
similarity index 100%
rename from include/asm-x86/mach-default/smpboot_hooks.h
rename to arch/x86/include/asm/mach-default/smpboot_hooks.h

diff --git a/include/asm-x86/mach-generic/gpio.h b/arch/x86/include/asm/mach-generic/gpio.h
similarity index 100%
rename from include/asm-x86/mach-generic/gpio.h
rename to arch/x86/include/asm/mach-generic/gpio.h

diff --git a/include/asm-x86/mach-generic/mach_apic.h b/arch/x86/include/asm/mach-generic/mach_apic.h
similarity index 100%
rename from include/asm-x86/mach-generic/mach_apic.h
rename to arch/x86/include/asm/mach-generic/mach_apic.h

diff --git a/include/asm-x86/mach-generic/mach_apicdef.h b/arch/x86/include/asm/mach-generic/mach_apicdef.h
similarity index 100%
rename from include/asm-x86/mach-generic/mach_apicdef.h
rename to arch/x86/include/asm/mach-generic/mach_apicdef.h

diff --git a/include/asm-x86/mach-generic/mach_ipi.h b/arch/x86/include/asm/mach-generic/mach_ipi.h
similarity index 100%
rename from include/asm-x86/mach-generic/mach_ipi.h
rename to arch/x86/include/asm/mach-generic/mach_ipi.h

diff --git a/include/asm-x86/mach-generic/mach_mpparse.h b/arch/x86/include/asm/mach-generic/mach_mpparse.h
similarity index 100%
rename from include/asm-x86/mach-generic/mach_mpparse.h
rename to arch/x86/include/asm/mach-generic/mach_mpparse.h

diff --git a/include/asm-x86/mach-generic/mach_mpspec.h b/arch/x86/include/asm/mach-generic/mach_mpspec.h
similarity index 100%
rename from include/asm-x86/mach-generic/mach_mpspec.h
rename to arch/x86/include/asm/mach-generic/mach_mpspec.h

diff --git a/include/asm-x86/mach-rdc321x/gpio.h b/arch/x86/include/asm/mach-rdc321x/gpio.h
similarity index 100%
rename from include/asm-x86/mach-rdc321x/gpio.h
rename to arch/x86/include/asm/mach-rdc321x/gpio.h

diff --git a/include/asm-x86/mach-rdc321x/rdc321x_defs.h b/arch/x86/include/asm/mach-rdc321x/rdc321x_defs.h
similarity index 100%
rename from include/asm-x86/mach-rdc321x/rdc321x_defs.h
rename to arch/x86/include/asm/mach-rdc321x/rdc321x_defs.h

diff --git a/include/asm-x86/mach-voyager/do_timer.h b/arch/x86/include/asm/mach-voyager/do_timer.h
similarity index 100%
rename from include/asm-x86/mach-voyager/do_timer.h
rename to arch/x86/include/asm/mach-voyager/do_timer.h

diff --git a/include/asm-x86/mach-voyager/entry_arch.h b/arch/x86/include/asm/mach-voyager/entry_arch.h
similarity index 100%
rename from include/asm-x86/mach-voyager/entry_arch.h
rename to arch/x86/include/asm/mach-voyager/entry_arch.h

diff --git a/include/asm-x86/mach-voyager/setup_arch.h b/arch/x86/include/asm/mach-voyager/setup_arch.h
similarity index 100%
rename from include/asm-x86/mach-voyager/setup_arch.h
rename to arch/x86/include/asm/mach-voyager/setup_arch.h

diff --git a/include/asm-x86/math_emu.h b/arch/x86/include/asm/math_emu.h
similarity index 100%
rename from include/asm-x86/math_emu.h
rename to arch/x86/include/asm/math_emu.h

diff --git a/include/asm-x86/mc146818rtc.h b/arch/x86/include/asm/mc146818rtc.h
similarity index 100%
rename from include/asm-x86/mc146818rtc.h
rename to arch/x86/include/asm/mc146818rtc.h

diff --git a/include/asm-x86/mca.h b/arch/x86/include/asm/mca.h
similarity index 100%
rename from include/asm-x86/mca.h
rename to arch/x86/include/asm/mca.h

diff --git a/include/asm-x86/mca_dma.h b/arch/x86/include/asm/mca_dma.h
similarity index 100%
rename from include/asm-x86/mca_dma.h
rename to arch/x86/include/asm/mca_dma.h

diff --git a/include/asm-x86/mce.h b/arch/x86/include/asm/mce.h
similarity index 100%
rename from include/asm-x86/mce.h
rename to arch/x86/include/asm/mce.h

diff --git a/include/asm-x86/microcode.h b/arch/x86/include/asm/microcode.h
similarity index 100%
rename from include/asm-x86/microcode.h
rename to arch/x86/include/asm/microcode.h

diff --git a/include/asm-x86/mman.h b/arch/x86/include/asm/mman.h
similarity index 100%
rename from include/asm-x86/mman.h
rename to arch/x86/include/asm/mman.h

diff --git a/include/asm-x86/mmconfig.h b/arch/x86/include/asm/mmconfig.h
similarity index 100%
rename from include/asm-x86/mmconfig.h
rename to arch/x86/include/asm/mmconfig.h

diff --git a/include/asm-x86/mmu.h b/arch/x86/include/asm/mmu.h
similarity index 100%
rename from include/asm-x86/mmu.h
rename to arch/x86/include/asm/mmu.h

diff --git a/include/asm-x86/mmu_context.h b/arch/x86/include/asm/mmu_context.h
similarity index 100%
rename from include/asm-x86/mmu_context.h
rename to arch/x86/include/asm/mmu_context.h

diff --git a/include/asm-x86/mmu_context_32.h b/arch/x86/include/asm/mmu_context_32.h
similarity index 100%
rename from include/asm-x86/mmu_context_32.h
rename to arch/x86/include/asm/mmu_context_32.h

diff --git a/include/asm-x86/mmu_context_64.h b/arch/x86/include/asm/mmu_context_64.h
similarity index 100%
rename from include/asm-x86/mmu_context_64.h
rename to arch/x86/include/asm/mmu_context_64.h

diff --git a/include/asm-x86/mmx.h b/arch/x86/include/asm/mmx.h
similarity index 100%
rename from include/asm-x86/mmx.h
rename to arch/x86/include/asm/mmx.h

diff --git a/include/asm-x86/mmzone.h b/arch/x86/include/asm/mmzone.h
similarity index 100%
rename from include/asm-x86/mmzone.h
rename to arch/x86/include/asm/mmzone.h

diff --git a/include/asm-x86/mmzone_32.h b/arch/x86/include/asm/mmzone_32.h
similarity index 100%
rename from include/asm-x86/mmzone_32.h
rename to arch/x86/include/asm/mmzone_32.h

diff --git a/include/asm-x86/mmzone_64.h b/arch/x86/include/asm/mmzone_64.h
similarity index 100%
rename from include/asm-x86/mmzone_64.h
rename to arch/x86/include/asm/mmzone_64.h

diff --git a/include/asm-x86/module.h b/arch/x86/include/asm/module.h
similarity index 100%
rename from include/asm-x86/module.h
rename to arch/x86/include/asm/module.h

diff --git a/include/asm-x86/mpspec.h b/arch/x86/include/asm/mpspec.h
similarity index 100%
rename from include/asm-x86/mpspec.h
rename to arch/x86/include/asm/mpspec.h

diff --git a/include/asm-x86/mpspec_def.h b/arch/x86/include/asm/mpspec_def.h
similarity index 100%
rename from include/asm-x86/mpspec_def.h
rename to arch/x86/include/asm/mpspec_def.h

diff --git a/include/asm-x86/msgbuf.h b/arch/x86/include/asm/msgbuf.h
similarity index 100%
rename from include/asm-x86/msgbuf.h
rename to arch/x86/include/asm/msgbuf.h

diff --git a/include/asm-x86/msidef.h b/arch/x86/include/asm/msidef.h
similarity index 100%
rename from include/asm-x86/msidef.h
rename to arch/x86/include/asm/msidef.h

diff --git a/include/asm-x86/msr-index.h b/arch/x86/include/asm/msr-index.h
similarity index 100%
rename from include/asm-x86/msr-index.h
rename to arch/x86/include/asm/msr-index.h

diff --git a/include/asm-x86/msr.h b/arch/x86/include/asm/msr.h
similarity index 100%
rename from include/asm-x86/msr.h
rename to arch/x86/include/asm/msr.h

diff --git a/include/asm-x86/mtrr.h b/arch/x86/include/asm/mtrr.h
similarity index 100%
rename from include/asm-x86/mtrr.h
rename to arch/x86/include/asm/mtrr.h

diff --git a/include/asm-x86/mutex.h b/arch/x86/include/asm/mutex.h
similarity index 100%
rename from include/asm-x86/mutex.h
rename to arch/x86/include/asm/mutex.h

diff --git a/include/asm-x86/mutex_32.h b/arch/x86/include/asm/mutex_32.h
similarity index 100%
rename from include/asm-x86/mutex_32.h
rename to arch/x86/include/asm/mutex_32.h

diff --git a/include/asm-x86/mutex_64.h b/arch/x86/include/asm/mutex_64.h
similarity index 100%
rename from include/asm-x86/mutex_64.h
rename to arch/x86/include/asm/mutex_64.h

diff --git a/include/asm-x86/nmi.h b/arch/x86/include/asm/nmi.h
similarity index 100%
rename from include/asm-x86/nmi.h
rename to arch/x86/include/asm/nmi.h

diff --git a/include/asm-x86/nops.h b/arch/x86/include/asm/nops.h
similarity index 100%
rename from include/asm-x86/nops.h
rename to arch/x86/include/asm/nops.h

diff --git a/include/asm-x86/numa.h b/arch/x86/include/asm/numa.h
similarity index 100%
rename from include/asm-x86/numa.h
rename to arch/x86/include/asm/numa.h

diff --git a/include/asm-x86/numa_32.h b/arch/x86/include/asm/numa_32.h
similarity index 100%
rename from include/asm-x86/numa_32.h
rename to arch/x86/include/asm/numa_32.h

diff --git a/include/asm-x86/numa_64.h b/arch/x86/include/asm/numa_64.h
similarity index 100%
rename from include/asm-x86/numa_64.h
rename to arch/x86/include/asm/numa_64.h

diff --git a/include/asm-x86/numaq.h b/arch/x86/include/asm/numaq.h
similarity index 100%
rename from include/asm-x86/numaq.h
rename to arch/x86/include/asm/numaq.h

diff --git a/include/asm-x86/numaq/apic.h b/arch/x86/include/asm/numaq/apic.h
similarity index 100%
rename from include/asm-x86/numaq/apic.h
rename to arch/x86/include/asm/numaq/apic.h

diff --git a/include/asm-x86/numaq/apicdef.h b/arch/x86/include/asm/numaq/apicdef.h
similarity index 100%
rename from include/asm-x86/numaq/apicdef.h
rename to arch/x86/include/asm/numaq/apicdef.h

diff --git a/include/asm-x86/numaq/ipi.h b/arch/x86/include/asm/numaq/ipi.h
similarity index 100%
rename from include/asm-x86/numaq/ipi.h
rename to arch/x86/include/asm/numaq/ipi.h

diff --git a/include/asm-x86/numaq/mpparse.h b/arch/x86/include/asm/numaq/mpparse.h
similarity index 100%
rename from include/asm-x86/numaq/mpparse.h
rename to arch/x86/include/asm/numaq/mpparse.h

diff --git a/include/asm-x86/numaq/wakecpu.h b/arch/x86/include/asm/numaq/wakecpu.h
similarity index 100%
rename from include/asm-x86/numaq/wakecpu.h
rename to arch/x86/include/asm/numaq/wakecpu.h

diff --git a/include/asm-x86/olpc.h b/arch/x86/include/asm/olpc.h
similarity index 100%
rename from include/asm-x86/olpc.h
rename to arch/x86/include/asm/olpc.h

diff --git a/include/asm-x86/page.h b/arch/x86/include/asm/page.h
similarity index 100%
rename from include/asm-x86/page.h
rename to arch/x86/include/asm/page.h

diff --git a/include/asm-x86/page_32.h b/arch/x86/include/asm/page_32.h
similarity index 100%
rename from include/asm-x86/page_32.h
rename to arch/x86/include/asm/page_32.h

diff --git a/include/asm-x86/page_64.h b/arch/x86/include/asm/page_64.h
similarity index 100%
rename from include/asm-x86/page_64.h
rename to arch/x86/include/asm/page_64.h

diff --git a/include/asm-x86/param.h b/arch/x86/include/asm/param.h
similarity index 100%
rename from include/asm-x86/param.h
rename to arch/x86/include/asm/param.h

diff --git a/include/asm-x86/paravirt.h b/arch/x86/include/asm/paravirt.h
similarity index 100%
rename from include/asm-x86/paravirt.h
rename to arch/x86/include/asm/paravirt.h

diff --git a/include/asm-x86/parport.h b/arch/x86/include/asm/parport.h
similarity index 100%
rename from include/asm-x86/parport.h
rename to arch/x86/include/asm/parport.h

diff --git a/include/asm-x86/pat.h b/arch/x86/include/asm/pat.h
similarity index 100%
rename from include/asm-x86/pat.h
rename to arch/x86/include/asm/pat.h

diff --git a/include/asm-x86/pci-direct.h b/arch/x86/include/asm/pci-direct.h
similarity index 100%
rename from include/asm-x86/pci-direct.h
rename to arch/x86/include/asm/pci-direct.h

diff --git a/include/asm-x86/pci.h b/arch/x86/include/asm/pci.h
similarity index 100%
rename from include/asm-x86/pci.h
rename to arch/x86/include/asm/pci.h

diff --git a/include/asm-x86/pci_32.h b/arch/x86/include/asm/pci_32.h
similarity index 100%
rename from include/asm-x86/pci_32.h
rename to arch/x86/include/asm/pci_32.h

diff --git a/include/asm-x86/pci_64.h b/arch/x86/include/asm/pci_64.h
similarity index 100%
rename from include/asm-x86/pci_64.h
rename to arch/x86/include/asm/pci_64.h

diff --git a/include/asm-x86/pda.h b/arch/x86/include/asm/pda.h
similarity index 100%
rename from include/asm-x86/pda.h
rename to arch/x86/include/asm/pda.h

diff --git a/include/asm-x86/percpu.h b/arch/x86/include/asm/percpu.h
similarity index 100%
rename from include/asm-x86/percpu.h
rename to arch/x86/include/asm/percpu.h

diff --git a/include/asm-x86/pgalloc.h b/arch/x86/include/asm/pgalloc.h
similarity index 100%
rename from include/asm-x86/pgalloc.h
rename to arch/x86/include/asm/pgalloc.h

diff --git a/include/asm-x86/pgtable-2level-defs.h b/arch/x86/include/asm/pgtable-2level-defs.h
similarity index 100%
rename from include/asm-x86/pgtable-2level-defs.h
rename to arch/x86/include/asm/pgtable-2level-defs.h

diff --git a/include/asm-x86/pgtable-2level.h b/arch/x86/include/asm/pgtable-2level.h
similarity index 100%
rename from include/asm-x86/pgtable-2level.h
rename to arch/x86/include/asm/pgtable-2level.h

diff --git a/include/asm-x86/pgtable-3level-defs.h b/arch/x86/include/asm/pgtable-3level-defs.h
similarity index 100%
rename from include/asm-x86/pgtable-3level-defs.h
rename to arch/x86/include/asm/pgtable-3level-defs.h

diff --git a/include/asm-x86/pgtable-3level.h b/arch/x86/include/asm/pgtable-3level.h
similarity index 100%
rename from include/asm-x86/pgtable-3level.h
rename to arch/x86/include/asm/pgtable-3level.h

diff --git a/include/asm-x86/pgtable.h b/arch/x86/include/asm/pgtable.h
similarity index 100%
rename from include/asm-x86/pgtable.h
rename to arch/x86/include/asm/pgtable.h

diff --git a/include/asm-x86/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h
similarity index 100%
rename from include/asm-x86/pgtable_32.h
rename to arch/x86/include/asm/pgtable_32.h

diff --git a/include/asm-x86/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
similarity index 100%
rename from include/asm-x86/pgtable_64.h
rename to arch/x86/include/asm/pgtable_64.h

diff --git a/include/asm-x86/poll.h b/arch/x86/include/asm/poll.h
similarity index 100%
rename from include/asm-x86/poll.h
rename to arch/x86/include/asm/poll.h

diff --git a/include/asm-x86/posix_types.h b/arch/x86/include/asm/posix_types.h
similarity index 100%
rename from include/asm-x86/posix_types.h
rename to arch/x86/include/asm/posix_types.h

diff --git a/include/asm-x86/posix_types_32.h b/arch/x86/include/asm/posix_types_32.h
similarity index 100%
rename from include/asm-x86/posix_types_32.h
rename to arch/x86/include/asm/posix_types_32.h

diff --git a/include/asm-x86/posix_types_64.h b/arch/x86/include/asm/posix_types_64.h
similarity index 100%
rename from include/asm-x86/posix_types_64.h
rename to arch/x86/include/asm/posix_types_64.h

diff --git a/include/asm-x86/prctl.h b/arch/x86/include/asm/prctl.h
similarity index 100%
rename from include/asm-x86/prctl.h
rename to arch/x86/include/asm/prctl.h

diff --git a/include/asm-x86/processor-cyrix.h b/arch/x86/include/asm/processor-cyrix.h
similarity index 100%
rename from include/asm-x86/processor-cyrix.h
rename to arch/x86/include/asm/processor-cyrix.h

diff --git a/include/asm-x86/processor-flags.h b/arch/x86/include/asm/processor-flags.h
similarity index 100%
rename from include/asm-x86/processor-flags.h
rename to arch/x86/include/asm/processor-flags.h

diff --git a/include/asm-x86/processor.h b/arch/x86/include/asm/processor.h
similarity index 100%
rename from include/asm-x86/processor.h
rename to arch/x86/include/asm/processor.h

diff --git a/include/asm-x86/proto.h b/arch/x86/include/asm/proto.h
similarity index 100%
rename from include/asm-x86/proto.h
rename to arch/x86/include/asm/proto.h

diff --git a/include/asm-x86/ptrace-abi.h b/arch/x86/include/asm/ptrace-abi.h
similarity index 100%
rename from include/asm-x86/ptrace-abi.h
rename to arch/x86/include/asm/ptrace-abi.h

diff --git a/include/asm-x86/ptrace.h b/arch/x86/include/asm/ptrace.h
similarity index 100%
rename from include/asm-x86/ptrace.h
rename to arch/x86/include/asm/ptrace.h

diff --git a/include/asm-x86/pvclock-abi.h b/arch/x86/include/asm/pvclock-abi.h
similarity index 100%
rename from include/asm-x86/pvclock-abi.h
rename to arch/x86/include/asm/pvclock-abi.h

diff --git a/include/asm-x86/pvclock.h b/arch/x86/include/asm/pvclock.h
similarity index 100%
rename from include/asm-x86/pvclock.h
rename to arch/x86/include/asm/pvclock.h

diff --git a/include/asm-x86/reboot.h b/arch/x86/include/asm/reboot.h
similarity index 100%
rename from include/asm-x86/reboot.h
rename to arch/x86/include/asm/reboot.h

diff --git a/include/asm-x86/reboot_fixups.h b/arch/x86/include/asm/reboot_fixups.h
similarity index 100%
rename from include/asm-x86/reboot_fixups.h
rename to arch/x86/include/asm/reboot_fixups.h

diff --git a/include/asm-x86/required-features.h b/arch/x86/include/asm/required-features.h
similarity index 100%
rename from include/asm-x86/required-features.h
rename to arch/x86/include/asm/required-features.h

diff --git a/include/asm-x86/resource.h b/arch/x86/include/asm/resource.h
similarity index 100%
rename from include/asm-x86/resource.h
rename to arch/x86/include/asm/resource.h

diff --git a/include/asm-x86/resume-trace.h b/arch/x86/include/asm/resume-trace.h
similarity index 100%
rename from include/asm-x86/resume-trace.h
rename to arch/x86/include/asm/resume-trace.h

diff --git a/include/asm-x86/rio.h b/arch/x86/include/asm/rio.h
similarity index 100%
rename from include/asm-x86/rio.h
rename to arch/x86/include/asm/rio.h

diff --git a/include/asm-x86/rtc.h b/arch/x86/include/asm/rtc.h
similarity index 100%
rename from include/asm-x86/rtc.h
rename to arch/x86/include/asm/rtc.h

diff --git a/include/asm-x86/rwlock.h b/arch/x86/include/asm/rwlock.h
similarity index 100%
rename from include/asm-x86/rwlock.h
rename to arch/x86/include/asm/rwlock.h

diff --git a/include/asm-x86/rwsem.h b/arch/x86/include/asm/rwsem.h
similarity index 100%
rename from include/asm-x86/rwsem.h
rename to arch/x86/include/asm/rwsem.h

diff --git a/include/asm-x86/scatterlist.h b/arch/x86/include/asm/scatterlist.h
similarity index 100%
rename from include/asm-x86/scatterlist.h
rename to arch/x86/include/asm/scatterlist.h

diff --git a/include/asm-x86/seccomp.h b/arch/x86/include/asm/seccomp.h
similarity index 100%
rename from include/asm-x86/seccomp.h
rename to arch/x86/include/asm/seccomp.h

diff --git a/include/asm-x86/seccomp_32.h b/arch/x86/include/asm/seccomp_32.h
similarity index 100%
rename from include/asm-x86/seccomp_32.h
rename to arch/x86/include/asm/seccomp_32.h

diff --git a/include/asm-x86/seccomp_64.h b/arch/x86/include/asm/seccomp_64.h
similarity index 100%
rename from include/asm-x86/seccomp_64.h
rename to arch/x86/include/asm/seccomp_64.h

diff --git a/include/asm-x86/sections.h b/arch/x86/include/asm/sections.h
similarity index 100%
rename from include/asm-x86/sections.h
rename to arch/x86/include/asm/sections.h

diff --git a/include/asm-x86/segment.h b/arch/x86/include/asm/segment.h
similarity index 100%
rename from include/asm-x86/segment.h
rename to arch/x86/include/asm/segment.h

diff --git a/include/asm-x86/sembuf.h b/arch/x86/include/asm/sembuf.h
similarity index 100%
rename from include/asm-x86/sembuf.h
rename to arch/x86/include/asm/sembuf.h

diff --git a/include/asm-x86/serial.h b/arch/x86/include/asm/serial.h
similarity index 100%
rename from include/asm-x86/serial.h
rename to arch/x86/include/asm/serial.h

diff --git a/include/asm-x86/setup.h b/arch/x86/include/asm/setup.h
similarity index 100%
rename from include/asm-x86/setup.h
rename to arch/x86/include/asm/setup.h

diff --git a/include/asm-x86/shmbuf.h b/arch/x86/include/asm/shmbuf.h
similarity index 100%
rename from include/asm-x86/shmbuf.h
rename to arch/x86/include/asm/shmbuf.h

diff --git a/include/asm-x86/shmparam.h b/arch/x86/include/asm/shmparam.h
similarity index 100%
rename from include/asm-x86/shmparam.h
rename to arch/x86/include/asm/shmparam.h

diff --git a/include/asm-x86/sigcontext.h b/arch/x86/include/asm/sigcontext.h
similarity index 100%
rename from include/asm-x86/sigcontext.h
rename to arch/x86/include/asm/sigcontext.h

diff --git a/include/asm-x86/sigcontext32.h b/arch/x86/include/asm/sigcontext32.h
similarity index 100%
rename from include/asm-x86/sigcontext32.h
rename to arch/x86/include/asm/sigcontext32.h

diff --git a/include/asm-x86/siginfo.h b/arch/x86/include/asm/siginfo.h
similarity index 100%
rename from include/asm-x86/siginfo.h
rename to arch/x86/include/asm/siginfo.h

diff --git a/include/asm-x86/signal.h b/arch/x86/include/asm/signal.h
similarity index 100%
rename from include/asm-x86/signal.h
rename to arch/x86/include/asm/signal.h

diff --git a/include/asm-x86/smp.h b/arch/x86/include/asm/smp.h
similarity index 100%
rename from include/asm-x86/smp.h
rename to arch/x86/include/asm/smp.h

diff --git a/include/asm-x86/socket.h b/arch/x86/include/asm/socket.h
similarity index 100%
rename from include/asm-x86/socket.h
rename to arch/x86/include/asm/socket.h

diff --git a/include/asm-x86/sockios.h b/arch/x86/include/asm/sockios.h
similarity index 100%
rename from include/asm-x86/sockios.h
rename to arch/x86/include/asm/sockios.h

diff --git a/include/asm-x86/sparsemem.h b/arch/x86/include/asm/sparsemem.h
similarity index 100%
rename from include/asm-x86/sparsemem.h
rename to arch/x86/include/asm/sparsemem.h

diff --git a/include/asm-x86/spinlock.h b/arch/x86/include/asm/spinlock.h
similarity index 100%
rename from include/asm-x86/spinlock.h
rename to arch/x86/include/asm/spinlock.h

diff --git a/include/asm-x86/spinlock_types.h b/arch/x86/include/asm/spinlock_types.h
similarity index 100%
rename from include/asm-x86/spinlock_types.h
rename to arch/x86/include/asm/spinlock_types.h

diff --git a/include/asm-x86/srat.h b/arch/x86/include/asm/srat.h
similarity index 100%
rename from include/asm-x86/srat.h
rename to arch/x86/include/asm/srat.h

diff --git a/include/asm-x86/stacktrace.h b/arch/x86/include/asm/stacktrace.h
similarity index 100%
rename from include/asm-x86/stacktrace.h
rename to arch/x86/include/asm/stacktrace.h

diff --git a/include/asm-x86/stat.h b/arch/x86/include/asm/stat.h
similarity index 100%
rename from include/asm-x86/stat.h
rename to arch/x86/include/asm/stat.h

diff --git a/include/asm-x86/statfs.h b/arch/x86/include/asm/statfs.h
similarity index 100%
rename from include/asm-x86/statfs.h
rename to arch/x86/include/asm/statfs.h

diff --git a/include/asm-x86/string.h b/arch/x86/include/asm/string.h
similarity index 100%
rename from include/asm-x86/string.h
rename to arch/x86/include/asm/string.h

diff --git a/include/asm-x86/string_32.h b/arch/x86/include/asm/string_32.h
similarity index 100%
rename from include/asm-x86/string_32.h
rename to arch/x86/include/asm/string_32.h

diff --git a/include/asm-x86/string_64.h b/arch/x86/include/asm/string_64.h
similarity index 100%
rename from include/asm-x86/string_64.h
rename to arch/x86/include/asm/string_64.h

diff --git a/include/asm-x86/summit/apic.h b/arch/x86/include/asm/summit/apic.h
similarity index 100%
rename from include/asm-x86/summit/apic.h
rename to arch/x86/include/asm/summit/apic.h

diff --git a/include/asm-x86/summit/apicdef.h b/arch/x86/include/asm/summit/apicdef.h
similarity index 100%
rename from include/asm-x86/summit/apicdef.h
rename to arch/x86/include/asm/summit/apicdef.h

diff --git a/include/asm-x86/summit/ipi.h b/arch/x86/include/asm/summit/ipi.h
similarity index 100%
rename from include/asm-x86/summit/ipi.h
rename to arch/x86/include/asm/summit/ipi.h

diff --git a/include/asm-x86/summit/mpparse.h b/arch/x86/include/asm/summit/mpparse.h
similarity index 100%
rename from include/asm-x86/summit/mpparse.h
rename to arch/x86/include/asm/summit/mpparse.h

diff --git a/include/asm-x86/suspend.h b/arch/x86/include/asm/suspend.h
similarity index 100%
rename from include/asm-x86/suspend.h
rename to arch/x86/include/asm/suspend.h

diff --git a/include/asm-x86/suspend_32.h b/arch/x86/include/asm/suspend_32.h
similarity index 100%
rename from include/asm-x86/suspend_32.h
rename to arch/x86/include/asm/suspend_32.h

diff --git a/include/asm-x86/suspend_64.h b/arch/x86/include/asm/suspend_64.h
similarity index 100%
rename from include/asm-x86/suspend_64.h
rename to arch/x86/include/asm/suspend_64.h

diff --git a/include/asm-x86/swiotlb.h b/arch/x86/include/asm/swiotlb.h
similarity index 100%
rename from include/asm-x86/swiotlb.h
rename to arch/x86/include/asm/swiotlb.h

diff --git a/include/asm-x86/sync_bitops.h b/arch/x86/include/asm/sync_bitops.h
similarity index 100%
rename from include/asm-x86/sync_bitops.h
rename to arch/x86/include/asm/sync_bitops.h

diff --git a/include/asm-x86/syscall.h b/arch/x86/include/asm/syscall.h
similarity index 100%
rename from include/asm-x86/syscall.h
rename to arch/x86/include/asm/syscall.h

diff --git a/include/asm-x86/syscalls.h b/arch/x86/include/asm/syscalls.h
similarity index 100%
rename from include/asm-x86/syscalls.h
rename to arch/x86/include/asm/syscalls.h

diff --git a/include/asm-x86/system.h b/arch/x86/include/asm/system.h
similarity index 100%
rename from include/asm-x86/system.h
rename to arch/x86/include/asm/system.h

diff --git a/include/asm-x86/system_64.h b/arch/x86/include/asm/system_64.h
similarity index 100%
rename from include/asm-x86/system_64.h
rename to arch/x86/include/asm/system_64.h

diff --git a/include/asm-x86/tce.h b/arch/x86/include/asm/tce.h
similarity index 100%
rename from include/asm-x86/tce.h
rename to arch/x86/include/asm/tce.h

diff --git a/include/asm-x86/termbits.h b/arch/x86/include/asm/termbits.h
similarity index 100%
rename from include/asm-x86/termbits.h
rename to arch/x86/include/asm/termbits.h

diff --git a/include/asm-x86/termios.h b/arch/x86/include/asm/termios.h
similarity index 100%
rename from include/asm-x86/termios.h
rename to arch/x86/include/asm/termios.h

diff --git a/include/asm-x86/therm_throt.h b/arch/x86/include/asm/therm_throt.h
similarity index 100%
rename from include/asm-x86/therm_throt.h
rename to arch/x86/include/asm/therm_throt.h

diff --git a/include/asm-x86/thread_info.h b/arch/x86/include/asm/thread_info.h
similarity index 100%
rename from include/asm-x86/thread_info.h
rename to arch/x86/include/asm/thread_info.h

diff --git a/include/asm-x86/time.h b/arch/x86/include/asm/time.h
similarity index 100%
rename from include/asm-x86/time.h
rename to arch/x86/include/asm/time.h

diff --git a/include/asm-x86/timer.h b/arch/x86/include/asm/timer.h
similarity index 100%
rename from include/asm-x86/timer.h
rename to arch/x86/include/asm/timer.h

diff --git a/include/asm-x86/timex.h b/arch/x86/include/asm/timex.h
similarity index 100%
rename from include/asm-x86/timex.h
rename to arch/x86/include/asm/timex.h

diff --git a/include/asm-x86/tlb.h b/arch/x86/include/asm/tlb.h
similarity index 100%
rename from include/asm-x86/tlb.h
rename to arch/x86/include/asm/tlb.h

diff --git a/include/asm-x86/tlbflush.h b/arch/x86/include/asm/tlbflush.h
similarity index 100%
rename from include/asm-x86/tlbflush.h
rename to arch/x86/include/asm/tlbflush.h

diff --git a/include/asm-x86/topology.h b/arch/x86/include/asm/topology.h
similarity index 100%
rename from include/asm-x86/topology.h
rename to arch/x86/include/asm/topology.h

diff --git a/include/asm-x86/trampoline.h b/arch/x86/include/asm/trampoline.h
similarity index 100%
rename from include/asm-x86/trampoline.h
rename to arch/x86/include/asm/trampoline.h

diff --git a/include/asm-x86/traps.h b/arch/x86/include/asm/traps.h
similarity index 100%
rename from include/asm-x86/traps.h
rename to arch/x86/include/asm/traps.h

diff --git a/include/asm-x86/tsc.h b/arch/x86/include/asm/tsc.h
similarity index 100%
rename from include/asm-x86/tsc.h
rename to arch/x86/include/asm/tsc.h

diff --git a/include/asm-x86/types.h b/arch/x86/include/asm/types.h
similarity index 100%
rename from include/asm-x86/types.h
rename to arch/x86/include/asm/types.h

diff --git a/include/asm-x86/uaccess.h b/arch/x86/include/asm/uaccess.h
similarity index 100%
rename from include/asm-x86/uaccess.h
rename to arch/x86/include/asm/uaccess.h

diff --git a/include/asm-x86/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h
similarity index 100%
rename from include/asm-x86/uaccess_32.h
rename to arch/x86/include/asm/uaccess_32.h

diff --git a/include/asm-x86/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
similarity index 100%
rename from include/asm-x86/uaccess_64.h
rename to arch/x86/include/asm/uaccess_64.h

diff --git a/include/asm-x86/ucontext.h b/arch/x86/include/asm/ucontext.h
similarity index 100%
rename from include/asm-x86/ucontext.h
rename to arch/x86/include/asm/ucontext.h

diff --git a/include/asm-x86/unaligned.h b/arch/x86/include/asm/unaligned.h
similarity index 100%
rename from include/asm-x86/unaligned.h
rename to arch/x86/include/asm/unaligned.h

diff --git a/include/asm-x86/unistd.h b/arch/x86/include/asm/unistd.h
similarity index 100%
rename from include/asm-x86/unistd.h
rename to arch/x86/include/asm/unistd.h

diff --git a/include/asm-x86/unistd_32.h b/arch/x86/include/asm/unistd_32.h
similarity index 100%
rename from include/asm-x86/unistd_32.h
rename to arch/x86/include/asm/unistd_32.h

diff --git a/include/asm-x86/unistd_64.h b/arch/x86/include/asm/unistd_64.h
similarity index 100%
rename from include/asm-x86/unistd_64.h
rename to arch/x86/include/asm/unistd_64.h

diff --git a/include/asm-x86/unwind.h b/arch/x86/include/asm/unwind.h
similarity index 100%
rename from include/asm-x86/unwind.h
rename to arch/x86/include/asm/unwind.h

diff --git a/include/asm-x86/user.h b/arch/x86/include/asm/user.h
similarity index 100%
rename from include/asm-x86/user.h
rename to arch/x86/include/asm/user.h

diff --git a/include/asm-x86/user32.h b/arch/x86/include/asm/user32.h
similarity index 100%
rename from include/asm-x86/user32.h
rename to arch/x86/include/asm/user32.h

diff --git a/include/asm-x86/user_32.h b/arch/x86/include/asm/user_32.h
similarity index 100%
rename from include/asm-x86/user_32.h
rename to arch/x86/include/asm/user_32.h

diff --git a/include/asm-x86/user_64.h b/arch/x86/include/asm/user_64.h
similarity index 100%
rename from include/asm-x86/user_64.h
rename to arch/x86/include/asm/user_64.h

diff --git a/include/asm-x86/uv/bios.h b/arch/x86/include/asm/uv/bios.h
similarity index 100%
rename from include/asm-x86/uv/bios.h
rename to arch/x86/include/asm/uv/bios.h

diff --git a/include/asm-x86/uv/uv_bau.h b/arch/x86/include/asm/uv/uv_bau.h
similarity index 100%
rename from include/asm-x86/uv/uv_bau.h
rename to arch/x86/include/asm/uv/uv_bau.h

diff --git a/include/asm-x86/uv/uv_hub.h b/arch/x86/include/asm/uv/uv_hub.h
similarity index 100%
rename from include/asm-x86/uv/uv_hub.h
rename to arch/x86/include/asm/uv/uv_hub.h

diff --git a/include/asm-x86/uv/uv_irq.h b/arch/x86/include/asm/uv/uv_irq.h
similarity index 100%
rename from include/asm-x86/uv/uv_irq.h
rename to arch/x86/include/asm/uv/uv_irq.h

diff --git a/include/asm-x86/uv/uv_mmrs.h b/arch/x86/include/asm/uv/uv_mmrs.h
similarity index 100%
rename from include/asm-x86/uv/uv_mmrs.h
rename to arch/x86/include/asm/uv/uv_mmrs.h

diff --git a/include/asm-x86/vdso.h b/arch/x86/include/asm/vdso.h
similarity index 100%
rename from include/asm-x86/vdso.h
rename to arch/x86/include/asm/vdso.h

diff --git a/include/asm-x86/vga.h b/arch/x86/include/asm/vga.h
similarity index 100%
rename from include/asm-x86/vga.h
rename to arch/x86/include/asm/vga.h

diff --git a/include/asm-x86/vgtod.h b/arch/x86/include/asm/vgtod.h
similarity index 100%
rename from include/asm-x86/vgtod.h
rename to arch/x86/include/asm/vgtod.h

diff --git a/include/asm-x86/vic.h b/arch/x86/include/asm/vic.h
similarity index 100%
rename from include/asm-x86/vic.h
rename to arch/x86/include/asm/vic.h

diff --git a/include/asm-x86/visws/cobalt.h b/arch/x86/include/asm/visws/cobalt.h
similarity index 100%
rename from include/asm-x86/visws/cobalt.h
rename to arch/x86/include/asm/visws/cobalt.h

diff --git a/include/asm-x86/visws/lithium.h b/arch/x86/include/asm/visws/lithium.h
similarity index 100%
rename from include/asm-x86/visws/lithium.h
rename to arch/x86/include/asm/visws/lithium.h

diff --git a/include/asm-x86/visws/piix4.h b/arch/x86/include/asm/visws/piix4.h
similarity index 100%
rename from include/asm-x86/visws/piix4.h
rename to arch/x86/include/asm/visws/piix4.h

diff --git a/include/asm-x86/visws/sgivw.h b/arch/x86/include/asm/visws/sgivw.h
similarity index 100%
rename from include/asm-x86/visws/sgivw.h
rename to arch/x86/include/asm/visws/sgivw.h

diff --git a/include/asm-x86/vm86.h b/arch/x86/include/asm/vm86.h
similarity index 100%
rename from include/asm-x86/vm86.h
rename to arch/x86/include/asm/vm86.h

diff --git a/include/asm-x86/vmi.h b/arch/x86/include/asm/vmi.h
similarity index 100%
rename from include/asm-x86/vmi.h
rename to arch/x86/include/asm/vmi.h

diff --git a/include/asm-x86/vmi_time.h b/arch/x86/include/asm/vmi_time.h
similarity index 100%
rename from include/asm-x86/vmi_time.h
rename to arch/x86/include/asm/vmi_time.h

diff --git a/include/asm-x86/voyager.h b/arch/x86/include/asm/voyager.h
similarity index 100%
rename from include/asm-x86/voyager.h
rename to arch/x86/include/asm/voyager.h

diff --git a/include/asm-x86/vsyscall.h b/arch/x86/include/asm/vsyscall.h
similarity index 100%
rename from include/asm-x86/vsyscall.h
rename to arch/x86/include/asm/vsyscall.h

diff --git a/include/asm-x86/xcr.h b/arch/x86/include/asm/xcr.h
similarity index 100%
rename from include/asm-x86/xcr.h
rename to arch/x86/include/asm/xcr.h

diff --git a/include/asm-x86/xen/events.h b/arch/x86/include/asm/xen/events.h
similarity index 100%
rename from include/asm-x86/xen/events.h
rename to arch/x86/include/asm/xen/events.h

diff --git a/include/asm-x86/xen/grant_table.h b/arch/x86/include/asm/xen/grant_table.h
similarity index 100%
rename from include/asm-x86/xen/grant_table.h
rename to arch/x86/include/asm/xen/grant_table.h

diff --git a/include/asm-x86/xen/hypercall.h b/arch/x86/include/asm/xen/hypercall.h
similarity index 100%
rename from include/asm-x86/xen/hypercall.h
rename to arch/x86/include/asm/xen/hypercall.h

diff --git a/include/asm-x86/xen/hypervisor.h b/arch/x86/include/asm/xen/hypervisor.h
similarity index 100%
rename from include/asm-x86/xen/hypervisor.h
rename to arch/x86/include/asm/xen/hypervisor.h

diff --git a/include/asm-x86/xen/interface.h b/arch/x86/include/asm/xen/interface.h
similarity index 100%
rename from include/asm-x86/xen/interface.h
rename to arch/x86/include/asm/xen/interface.h

diff --git a/include/asm-x86/xen/interface_32.h b/arch/x86/include/asm/xen/interface_32.h
similarity index 100%
rename from include/asm-x86/xen/interface_32.h
rename to arch/x86/include/asm/xen/interface_32.h

diff --git a/include/asm-x86/xen/interface_64.h b/arch/x86/include/asm/xen/interface_64.h
similarity index 100%
rename from include/asm-x86/xen/interface_64.h
rename to arch/x86/include/asm/xen/interface_64.h

diff --git a/include/asm-x86/xen/page.h b/arch/x86/include/asm/xen/page.h
similarity index 100%
rename from include/asm-x86/xen/page.h
rename to arch/x86/include/asm/xen/page.h

diff --git a/include/asm-x86/xor.h b/arch/x86/include/asm/xor.h
similarity index 100%
rename from include/asm-x86/xor.h
rename to arch/x86/include/asm/xor.h

diff --git a/include/asm-x86/xor_32.h b/arch/x86/include/asm/xor_32.h
similarity index 100%
rename from include/asm-x86/xor_32.h
rename to arch/x86/include/asm/xor_32.h

diff --git a/include/asm-x86/xor_64.h b/arch/x86/include/asm/xor_64.h
similarity index 100%
rename from include/asm-x86/xor_64.h
rename to arch/x86/include/asm/xor_64.h

diff --git a/include/asm-x86/xsave.h b/arch/x86/include/asm/xsave.h
similarity index 100%
rename from include/asm-x86/xsave.h
rename to arch/x86/include/asm/xsave.h

diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index 7f0b45a5d7887cf393452c7983073a683390f0e4..82ec6075c057b695cf6904a28a58fb8c60c37d7a 100644 (file)
--- a/arch/x86/kernel/cpu/Makefile
+++ b/arch/x86/kernel/cpu/Makefile
@@ -25,7 +25,7 @@ obj-$(CONFIG_X86_LOCAL_APIC) += perfctr-watchdog.o
 quiet_cmd_mkcapflags = MKCAP   $@
       cmd_mkcapflags = $(PERL) $(srctree)/$(src)/mkcapflags.pl $< $@
 
-cpufeature = $(src)/../../../../include/asm-x86/cpufeature.h
+cpufeature = $(src)/../../include/asm/cpufeature.h
 
 targets += capflags.c
 $(obj)/capflags.c: $(cpufeature) $(src)/mkcapflags.pl FORCE

diff --git a/drivers/xen/cpu_hotplug.c b/drivers/xen/cpu_hotplug.c
index 565280ec1c6a221dd3cc3c2652c21548d9d58600..974f56d1ebe1fa6ba67a4998f96f63e1fbdc96e9 100644 (file)
--- a/drivers/xen/cpu_hotplug.c
+++ b/drivers/xen/cpu_hotplug.c
@@ -2,7 +2,7 @@
 
 #include <xen/xenbus.h>
 
-#include <asm-x86/xen/hypervisor.h>
+#include <asm/xen/hypervisor.h>
 #include <asm/cpu.h>
 
 static void enable_hotplug_cpu(int cpu)

diff --git a/scripts/checksyscalls.sh b/scripts/checksyscalls.sh
index 366f8c7f62bf6de4d82a1ae543e6157a7de07548..41564b142c0451f8512905ee5534bec1910544b3 100755 (executable)
--- a/scripts/checksyscalls.sh
+++ b/scripts/checksyscalls.sh
@@ -119,5 +119,5 @@ sed -n -e '/^\#define/ { s/[^_]*__NR_\([^[:space:]]*\).*/\
 \#endif/p }' $1
 }
 
-(ignore_list && syscall_list ${srctree}/include/asm-x86/unistd_32.h) | \
+(ignore_list && syscall_list ${srctree}/arch/x86/include/asm/unistd_32.h) | \
 $* -E -x c - > /dev/null