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>
sbates130272 · Oct 23, 2008 · bb89855 · bb89855
1 parent 8ede0bd
commit bb89855
Show file tree

Hide file tree

Showing 340 changed files with 11 additions and 11 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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 → arch/x86/include/asm/Kbuild b/include/asm-x86/Kbuild → arch/x86/include/asm/Kbuild
diff --git a/include/asm-x86/a.out-core.h → arch/x86/include/asm/a.out-core.h b/include/asm-x86/a.out-core.h → arch/x86/include/asm/a.out-core.h
diff --git a/include/asm-x86/a.out.h → arch/x86/include/asm/a.out.h b/include/asm-x86/a.out.h → arch/x86/include/asm/a.out.h
diff --git a/include/asm-x86/acpi.h → arch/x86/include/asm/acpi.h b/include/asm-x86/acpi.h → arch/x86/include/asm/acpi.h
diff --git a/include/asm-x86/agp.h → arch/x86/include/asm/agp.h b/include/asm-x86/agp.h → arch/x86/include/asm/agp.h
diff --git a/include/asm-x86/alternative-asm.h → arch/x86/include/asm/alternative-asm.h b/include/asm-x86/alternative-asm.h → arch/x86/include/asm/alternative-asm.h
diff --git a/include/asm-x86/alternative.h → arch/x86/include/asm/alternative.h b/include/asm-x86/alternative.h → arch/x86/include/asm/alternative.h
diff --git a/include/asm-x86/amd_iommu.h → arch/x86/include/asm/amd_iommu.h b/include/asm-x86/amd_iommu.h → arch/x86/include/asm/amd_iommu.h
diff --git a/include/asm-x86/amd_iommu_types.h → arch/x86/include/asm/amd_iommu_types.h b/include/asm-x86/amd_iommu_types.h → arch/x86/include/asm/amd_iommu_types.h
diff --git a/include/asm-x86/apic.h → arch/x86/include/asm/apic.h b/include/asm-x86/apic.h → arch/x86/include/asm/apic.h
diff --git a/include/asm-x86/apicdef.h → arch/x86/include/asm/apicdef.h b/include/asm-x86/apicdef.h → arch/x86/include/asm/apicdef.h
diff --git a/include/asm-x86/arch_hooks.h → arch/x86/include/asm/arch_hooks.h b/include/asm-x86/arch_hooks.h → arch/x86/include/asm/arch_hooks.h
diff --git a/include/asm-x86/asm.h → arch/x86/include/asm/asm.h b/include/asm-x86/asm.h → arch/x86/include/asm/asm.h
diff --git a/include/asm-x86/atomic.h → arch/x86/include/asm/atomic.h b/include/asm-x86/atomic.h → arch/x86/include/asm/atomic.h
diff --git a/include/asm-x86/atomic_32.h → arch/x86/include/asm/atomic_32.h b/include/asm-x86/atomic_32.h → arch/x86/include/asm/atomic_32.h
diff --git a/include/asm-x86/atomic_64.h → arch/x86/include/asm/atomic_64.h b/include/asm-x86/atomic_64.h → arch/x86/include/asm/atomic_64.h
diff --git a/include/asm-x86/auxvec.h → arch/x86/include/asm/auxvec.h b/include/asm-x86/auxvec.h → arch/x86/include/asm/auxvec.h
diff --git a/include/asm-x86/bigsmp/apic.h → arch/x86/include/asm/bigsmp/apic.h b/include/asm-x86/bigsmp/apic.h → arch/x86/include/asm/bigsmp/apic.h
diff --git a/include/asm-x86/bigsmp/apicdef.h → arch/x86/include/asm/bigsmp/apicdef.h b/include/asm-x86/bigsmp/apicdef.h → arch/x86/include/asm/bigsmp/apicdef.h
diff --git a/include/asm-x86/bigsmp/ipi.h → arch/x86/include/asm/bigsmp/ipi.h b/include/asm-x86/bigsmp/ipi.h → arch/x86/include/asm/bigsmp/ipi.h
diff --git a/include/asm-x86/bios_ebda.h → arch/x86/include/asm/bios_ebda.h b/include/asm-x86/bios_ebda.h → arch/x86/include/asm/bios_ebda.h
diff --git a/include/asm-x86/bitops.h → arch/x86/include/asm/bitops.h b/include/asm-x86/bitops.h → arch/x86/include/asm/bitops.h
diff --git a/include/asm-x86/boot.h → arch/x86/include/asm/boot.h b/include/asm-x86/boot.h → arch/x86/include/asm/boot.h
diff --git a/include/asm-x86/bootparam.h → arch/x86/include/asm/bootparam.h b/include/asm-x86/bootparam.h → arch/x86/include/asm/bootparam.h
diff --git a/include/asm-x86/bug.h → arch/x86/include/asm/bug.h b/include/asm-x86/bug.h → arch/x86/include/asm/bug.h
diff --git a/include/asm-x86/bugs.h → arch/x86/include/asm/bugs.h b/include/asm-x86/bugs.h → arch/x86/include/asm/bugs.h
diff --git a/include/asm-x86/byteorder.h → arch/x86/include/asm/byteorder.h b/include/asm-x86/byteorder.h → arch/x86/include/asm/byteorder.h
diff --git a/include/asm-x86/cache.h → arch/x86/include/asm/cache.h b/include/asm-x86/cache.h → arch/x86/include/asm/cache.h
diff --git a/include/asm-x86/cacheflush.h → arch/x86/include/asm/cacheflush.h b/include/asm-x86/cacheflush.h → arch/x86/include/asm/cacheflush.h
diff --git a/include/asm-x86/calgary.h → arch/x86/include/asm/calgary.h b/include/asm-x86/calgary.h → arch/x86/include/asm/calgary.h
diff --git a/include/asm-x86/calling.h → arch/x86/include/asm/calling.h b/include/asm-x86/calling.h → arch/x86/include/asm/calling.h
diff --git a/include/asm-x86/checksum.h → arch/x86/include/asm/checksum.h b/include/asm-x86/checksum.h → arch/x86/include/asm/checksum.h
diff --git a/include/asm-x86/checksum_32.h → arch/x86/include/asm/checksum_32.h b/include/asm-x86/checksum_32.h → arch/x86/include/asm/checksum_32.h
diff --git a/include/asm-x86/checksum_64.h → arch/x86/include/asm/checksum_64.h b/include/asm-x86/checksum_64.h → arch/x86/include/asm/checksum_64.h
diff --git a/include/asm-x86/cmpxchg.h → arch/x86/include/asm/cmpxchg.h b/include/asm-x86/cmpxchg.h → arch/x86/include/asm/cmpxchg.h
diff --git a/include/asm-x86/cmpxchg_32.h → arch/x86/include/asm/cmpxchg_32.h b/include/asm-x86/cmpxchg_32.h → arch/x86/include/asm/cmpxchg_32.h
diff --git a/include/asm-x86/cmpxchg_64.h → arch/x86/include/asm/cmpxchg_64.h b/include/asm-x86/cmpxchg_64.h → arch/x86/include/asm/cmpxchg_64.h
diff --git a/include/asm-x86/compat.h → arch/x86/include/asm/compat.h b/include/asm-x86/compat.h → arch/x86/include/asm/compat.h
diff --git a/include/asm-x86/cpu.h → arch/x86/include/asm/cpu.h b/include/asm-x86/cpu.h → arch/x86/include/asm/cpu.h
diff --git a/include/asm-x86/cpufeature.h → arch/x86/include/asm/cpufeature.h b/include/asm-x86/cpufeature.h → arch/x86/include/asm/cpufeature.h
diff --git a/include/asm-x86/cputime.h → arch/x86/include/asm/cputime.h b/include/asm-x86/cputime.h → arch/x86/include/asm/cputime.h
diff --git a/include/asm-x86/current.h → arch/x86/include/asm/current.h b/include/asm-x86/current.h → arch/x86/include/asm/current.h
diff --git a/include/asm-x86/debugreg.h → arch/x86/include/asm/debugreg.h b/include/asm-x86/debugreg.h → arch/x86/include/asm/debugreg.h
diff --git a/include/asm-x86/delay.h → arch/x86/include/asm/delay.h b/include/asm-x86/delay.h → arch/x86/include/asm/delay.h
diff --git a/include/asm-x86/desc.h → arch/x86/include/asm/desc.h b/include/asm-x86/desc.h → arch/x86/include/asm/desc.h
diff --git a/include/asm-x86/desc_defs.h → arch/x86/include/asm/desc_defs.h b/include/asm-x86/desc_defs.h → arch/x86/include/asm/desc_defs.h
diff --git a/include/asm-x86/device.h → arch/x86/include/asm/device.h b/include/asm-x86/device.h → arch/x86/include/asm/device.h
diff --git a/include/asm-x86/div64.h → arch/x86/include/asm/div64.h b/include/asm-x86/div64.h → arch/x86/include/asm/div64.h
diff --git a/include/asm-x86/dma-mapping.h → arch/x86/include/asm/dma-mapping.h b/include/asm-x86/dma-mapping.h → arch/x86/include/asm/dma-mapping.h
diff --git a/include/asm-x86/dma.h → arch/x86/include/asm/dma.h b/include/asm-x86/dma.h → arch/x86/include/asm/dma.h
diff --git a/include/asm-x86/dmi.h → arch/x86/include/asm/dmi.h b/include/asm-x86/dmi.h → arch/x86/include/asm/dmi.h
diff --git a/include/asm-x86/ds.h → arch/x86/include/asm/ds.h b/include/asm-x86/ds.h → arch/x86/include/asm/ds.h
diff --git a/include/asm-x86/dwarf2.h → arch/x86/include/asm/dwarf2.h b/include/asm-x86/dwarf2.h → arch/x86/include/asm/dwarf2.h
diff --git a/include/asm-x86/e820.h → arch/x86/include/asm/e820.h b/include/asm-x86/e820.h → arch/x86/include/asm/e820.h
diff --git a/include/asm-x86/edac.h → arch/x86/include/asm/edac.h b/include/asm-x86/edac.h → arch/x86/include/asm/edac.h
diff --git a/include/asm-x86/efi.h → arch/x86/include/asm/efi.h b/include/asm-x86/efi.h → arch/x86/include/asm/efi.h
diff --git a/include/asm-x86/elf.h → arch/x86/include/asm/elf.h b/include/asm-x86/elf.h → arch/x86/include/asm/elf.h
diff --git a/include/asm-x86/emergency-restart.h → arch/x86/include/asm/emergency-restart.h b/include/asm-x86/emergency-restart.h → arch/x86/include/asm/emergency-restart.h
diff --git a/include/asm-x86/errno.h → arch/x86/include/asm/errno.h b/include/asm-x86/errno.h → arch/x86/include/asm/errno.h
diff --git a/include/asm-x86/es7000/apic.h → arch/x86/include/asm/es7000/apic.h b/include/asm-x86/es7000/apic.h → arch/x86/include/asm/es7000/apic.h
diff --git a/include/asm-x86/es7000/apicdef.h → arch/x86/include/asm/es7000/apicdef.h b/include/asm-x86/es7000/apicdef.h → arch/x86/include/asm/es7000/apicdef.h
diff --git a/include/asm-x86/es7000/ipi.h → arch/x86/include/asm/es7000/ipi.h b/include/asm-x86/es7000/ipi.h → arch/x86/include/asm/es7000/ipi.h
diff --git a/include/asm-x86/es7000/mpparse.h → arch/x86/include/asm/es7000/mpparse.h b/include/asm-x86/es7000/mpparse.h → arch/x86/include/asm/es7000/mpparse.h
diff --git a/include/asm-x86/es7000/wakecpu.h → arch/x86/include/asm/es7000/wakecpu.h b/include/asm-x86/es7000/wakecpu.h → arch/x86/include/asm/es7000/wakecpu.h
diff --git a/include/asm-x86/fb.h → arch/x86/include/asm/fb.h b/include/asm-x86/fb.h → arch/x86/include/asm/fb.h
diff --git a/include/asm-x86/fcntl.h → arch/x86/include/asm/fcntl.h b/include/asm-x86/fcntl.h → arch/x86/include/asm/fcntl.h
diff --git a/include/asm-x86/fixmap.h → arch/x86/include/asm/fixmap.h b/include/asm-x86/fixmap.h → arch/x86/include/asm/fixmap.h
diff --git a/include/asm-x86/fixmap_32.h → arch/x86/include/asm/fixmap_32.h b/include/asm-x86/fixmap_32.h → arch/x86/include/asm/fixmap_32.h
diff --git a/include/asm-x86/fixmap_64.h → arch/x86/include/asm/fixmap_64.h b/include/asm-x86/fixmap_64.h → arch/x86/include/asm/fixmap_64.h
diff --git a/include/asm-x86/floppy.h → arch/x86/include/asm/floppy.h b/include/asm-x86/floppy.h → arch/x86/include/asm/floppy.h
diff --git a/include/asm-x86/frame.h → arch/x86/include/asm/frame.h b/include/asm-x86/frame.h → arch/x86/include/asm/frame.h
diff --git a/include/asm-x86/ftrace.h → arch/x86/include/asm/ftrace.h b/include/asm-x86/ftrace.h → arch/x86/include/asm/ftrace.h
diff --git a/include/asm-x86/futex.h → arch/x86/include/asm/futex.h b/include/asm-x86/futex.h → arch/x86/include/asm/futex.h
diff --git a/include/asm-x86/gart.h → arch/x86/include/asm/gart.h b/include/asm-x86/gart.h → arch/x86/include/asm/gart.h
diff --git a/include/asm-x86/genapic.h → arch/x86/include/asm/genapic.h b/include/asm-x86/genapic.h → arch/x86/include/asm/genapic.h
diff --git a/include/asm-x86/genapic_32.h → arch/x86/include/asm/genapic_32.h b/include/asm-x86/genapic_32.h → arch/x86/include/asm/genapic_32.h
diff --git a/include/asm-x86/genapic_64.h → arch/x86/include/asm/genapic_64.h b/include/asm-x86/genapic_64.h → arch/x86/include/asm/genapic_64.h
diff --git a/include/asm-x86/geode.h → arch/x86/include/asm/geode.h b/include/asm-x86/geode.h → arch/x86/include/asm/geode.h
diff --git a/include/asm-x86/gpio.h → arch/x86/include/asm/gpio.h b/include/asm-x86/gpio.h → arch/x86/include/asm/gpio.h
diff --git a/include/asm-x86/hardirq.h → arch/x86/include/asm/hardirq.h b/include/asm-x86/hardirq.h → arch/x86/include/asm/hardirq.h
diff --git a/include/asm-x86/hardirq_32.h → arch/x86/include/asm/hardirq_32.h b/include/asm-x86/hardirq_32.h → arch/x86/include/asm/hardirq_32.h
diff --git a/include/asm-x86/hardirq_64.h → arch/x86/include/asm/hardirq_64.h b/include/asm-x86/hardirq_64.h → arch/x86/include/asm/hardirq_64.h
diff --git a/include/asm-x86/highmem.h → arch/x86/include/asm/highmem.h b/include/asm-x86/highmem.h → arch/x86/include/asm/highmem.h
diff --git a/include/asm-x86/hpet.h → arch/x86/include/asm/hpet.h b/include/asm-x86/hpet.h → arch/x86/include/asm/hpet.h
diff --git a/include/asm-x86/hugetlb.h → arch/x86/include/asm/hugetlb.h b/include/asm-x86/hugetlb.h → arch/x86/include/asm/hugetlb.h
diff --git a/include/asm-x86/hw_irq.h → arch/x86/include/asm/hw_irq.h b/include/asm-x86/hw_irq.h → arch/x86/include/asm/hw_irq.h
diff --git a/include/asm-x86/hypertransport.h → arch/x86/include/asm/hypertransport.h b/include/asm-x86/hypertransport.h → arch/x86/include/asm/hypertransport.h
diff --git a/include/asm-x86/i387.h → arch/x86/include/asm/i387.h b/include/asm-x86/i387.h → arch/x86/include/asm/i387.h
diff --git a/include/asm-x86/i8253.h → arch/x86/include/asm/i8253.h b/include/asm-x86/i8253.h → arch/x86/include/asm/i8253.h
diff --git a/include/asm-x86/i8259.h → arch/x86/include/asm/i8259.h b/include/asm-x86/i8259.h → arch/x86/include/asm/i8259.h
diff --git a/include/asm-x86/ia32.h → arch/x86/include/asm/ia32.h b/include/asm-x86/ia32.h → arch/x86/include/asm/ia32.h
diff --git a/include/asm-x86/ia32_unistd.h → arch/x86/include/asm/ia32_unistd.h b/include/asm-x86/ia32_unistd.h → arch/x86/include/asm/ia32_unistd.h
diff --git a/include/asm-x86/idle.h → arch/x86/include/asm/idle.h b/include/asm-x86/idle.h → arch/x86/include/asm/idle.h
diff --git a/include/asm-x86/intel_arch_perfmon.h → arch/x86/include/asm/intel_arch_perfmon.h b/include/asm-x86/intel_arch_perfmon.h → arch/x86/include/asm/intel_arch_perfmon.h
diff --git a/include/asm-x86/io.h → arch/x86/include/asm/io.h b/include/asm-x86/io.h → arch/x86/include/asm/io.h
diff --git a/include/asm-x86/io_32.h → arch/x86/include/asm/io_32.h b/include/asm-x86/io_32.h → arch/x86/include/asm/io_32.h
diff --git a/include/asm-x86/io_64.h → arch/x86/include/asm/io_64.h b/include/asm-x86/io_64.h → arch/x86/include/asm/io_64.h
diff --git a/include/asm-x86/io_apic.h → arch/x86/include/asm/io_apic.h b/include/asm-x86/io_apic.h → arch/x86/include/asm/io_apic.h
diff --git a/include/asm-x86/ioctl.h → arch/x86/include/asm/ioctl.h b/include/asm-x86/ioctl.h → arch/x86/include/asm/ioctl.h
diff --git a/include/asm-x86/ioctls.h → arch/x86/include/asm/ioctls.h b/include/asm-x86/ioctls.h → arch/x86/include/asm/ioctls.h
diff --git a/include/asm-x86/iommu.h → arch/x86/include/asm/iommu.h b/include/asm-x86/iommu.h → arch/x86/include/asm/iommu.h
diff --git a/include/asm-x86/ipcbuf.h → arch/x86/include/asm/ipcbuf.h b/include/asm-x86/ipcbuf.h → arch/x86/include/asm/ipcbuf.h
diff --git a/include/asm-x86/ipi.h → arch/x86/include/asm/ipi.h b/include/asm-x86/ipi.h → arch/x86/include/asm/ipi.h
diff --git a/include/asm-x86/irq.h → arch/x86/include/asm/irq.h b/include/asm-x86/irq.h → arch/x86/include/asm/irq.h
diff --git a/include/asm-x86/irq_regs.h → arch/x86/include/asm/irq_regs.h b/include/asm-x86/irq_regs.h → arch/x86/include/asm/irq_regs.h
diff --git a/include/asm-x86/irq_regs_32.h → arch/x86/include/asm/irq_regs_32.h b/include/asm-x86/irq_regs_32.h → arch/x86/include/asm/irq_regs_32.h
diff --git a/include/asm-x86/irq_regs_64.h → arch/x86/include/asm/irq_regs_64.h b/include/asm-x86/irq_regs_64.h → arch/x86/include/asm/irq_regs_64.h
diff --git a/include/asm-x86/irq_remapping.h → arch/x86/include/asm/irq_remapping.h b/include/asm-x86/irq_remapping.h → arch/x86/include/asm/irq_remapping.h
diff --git a/include/asm-x86/irq_vectors.h → arch/x86/include/asm/irq_vectors.h b/include/asm-x86/irq_vectors.h → arch/x86/include/asm/irq_vectors.h
diff --git a/include/asm-x86/irqflags.h → arch/x86/include/asm/irqflags.h b/include/asm-x86/irqflags.h → arch/x86/include/asm/irqflags.h
diff --git a/include/asm-x86/ist.h → arch/x86/include/asm/ist.h b/include/asm-x86/ist.h → arch/x86/include/asm/ist.h
diff --git a/include/asm-x86/k8.h → arch/x86/include/asm/k8.h b/include/asm-x86/k8.h → arch/x86/include/asm/k8.h
diff --git a/include/asm-x86/kdebug.h → arch/x86/include/asm/kdebug.h b/include/asm-x86/kdebug.h → arch/x86/include/asm/kdebug.h
diff --git a/include/asm-x86/kexec.h → arch/x86/include/asm/kexec.h b/include/asm-x86/kexec.h → arch/x86/include/asm/kexec.h
diff --git a/include/asm-x86/kgdb.h → arch/x86/include/asm/kgdb.h b/include/asm-x86/kgdb.h → arch/x86/include/asm/kgdb.h
diff --git a/include/asm-x86/kmap_types.h → arch/x86/include/asm/kmap_types.h b/include/asm-x86/kmap_types.h → arch/x86/include/asm/kmap_types.h
diff --git a/include/asm-x86/kprobes.h → arch/x86/include/asm/kprobes.h b/include/asm-x86/kprobes.h → arch/x86/include/asm/kprobes.h
diff --git a/include/asm-x86/kvm.h → arch/x86/include/asm/kvm.h b/include/asm-x86/kvm.h → arch/x86/include/asm/kvm.h
diff --git a/include/asm-x86/kvm_host.h → arch/x86/include/asm/kvm_host.h b/include/asm-x86/kvm_host.h → arch/x86/include/asm/kvm_host.h
diff --git a/include/asm-x86/kvm_para.h → arch/x86/include/asm/kvm_para.h b/include/asm-x86/kvm_para.h → arch/x86/include/asm/kvm_para.h
diff --git a/include/asm-x86/kvm_x86_emulate.h → arch/x86/include/asm/kvm_x86_emulate.h b/include/asm-x86/kvm_x86_emulate.h → arch/x86/include/asm/kvm_x86_emulate.h
diff --git a/include/asm-x86/ldt.h → arch/x86/include/asm/ldt.h b/include/asm-x86/ldt.h → arch/x86/include/asm/ldt.h
diff --git a/include/asm-x86/lguest.h → arch/x86/include/asm/lguest.h b/include/asm-x86/lguest.h → arch/x86/include/asm/lguest.h
diff --git a/include/asm-x86/lguest_hcall.h → arch/x86/include/asm/lguest_hcall.h b/include/asm-x86/lguest_hcall.h → arch/x86/include/asm/lguest_hcall.h
diff --git a/include/asm-x86/linkage.h → arch/x86/include/asm/linkage.h b/include/asm-x86/linkage.h → arch/x86/include/asm/linkage.h
diff --git a/include/asm-x86/local.h → arch/x86/include/asm/local.h b/include/asm-x86/local.h → arch/x86/include/asm/local.h
diff --git a/include/asm-x86/mach-default/apm.h → arch/x86/include/asm/mach-default/apm.h b/include/asm-x86/mach-default/apm.h → arch/x86/include/asm/mach-default/apm.h
diff --git a/include/asm-x86/mach-default/do_timer.h → arch/x86/include/asm/mach-default/do_timer.h b/include/asm-x86/mach-default/do_timer.h → arch/x86/include/asm/mach-default/do_timer.h
diff --git a/include/asm-x86/mach-default/entry_arch.h → ...x86/include/asm/mach-default/entry_arch.h b/include/asm-x86/mach-default/entry_arch.h → ...x86/include/asm/mach-default/entry_arch.h
diff --git a/include/asm-x86/mach-default/mach_apic.h → .../x86/include/asm/mach-default/mach_apic.h b/include/asm-x86/mach-default/mach_apic.h → .../x86/include/asm/mach-default/mach_apic.h
diff --git a/include/asm-x86/mach-default/mach_apicdef.h → ...6/include/asm/mach-default/mach_apicdef.h b/include/asm-x86/mach-default/mach_apicdef.h → ...6/include/asm/mach-default/mach_apicdef.h
diff --git a/include/asm-x86/mach-default/mach_ipi.h → arch/x86/include/asm/mach-default/mach_ipi.h b/include/asm-x86/mach-default/mach_ipi.h → arch/x86/include/asm/mach-default/mach_ipi.h
diff --git a/include/asm-x86/mach-default/mach_mpparse.h → ...6/include/asm/mach-default/mach_mpparse.h b/include/asm-x86/mach-default/mach_mpparse.h → ...6/include/asm/mach-default/mach_mpparse.h
diff --git a/include/asm-x86/mach-default/mach_mpspec.h → ...86/include/asm/mach-default/mach_mpspec.h b/include/asm-x86/mach-default/mach_mpspec.h → ...86/include/asm/mach-default/mach_mpspec.h
diff --git a/include/asm-x86/mach-default/mach_timer.h → ...x86/include/asm/mach-default/mach_timer.h b/include/asm-x86/mach-default/mach_timer.h → ...x86/include/asm/mach-default/mach_timer.h
diff --git a/include/asm-x86/mach-default/mach_traps.h → ...x86/include/asm/mach-default/mach_traps.h b/include/asm-x86/mach-default/mach_traps.h → ...x86/include/asm/mach-default/mach_traps.h
diff --git a/include/asm-x86/mach-default/mach_wakecpu.h → ...6/include/asm/mach-default/mach_wakecpu.h b/include/asm-x86/mach-default/mach_wakecpu.h → ...6/include/asm/mach-default/mach_wakecpu.h
diff --git a/include/asm-x86/mach-default/pci-functions.h → .../include/asm/mach-default/pci-functions.h b/include/asm-x86/mach-default/pci-functions.h → .../include/asm/mach-default/pci-functions.h
diff --git a/include/asm-x86/mach-default/setup_arch.h → ...x86/include/asm/mach-default/setup_arch.h b/include/asm-x86/mach-default/setup_arch.h → ...x86/include/asm/mach-default/setup_arch.h
diff --git a/include/asm-x86/mach-default/smpboot_hooks.h → .../include/asm/mach-default/smpboot_hooks.h b/include/asm-x86/mach-default/smpboot_hooks.h → .../include/asm/mach-default/smpboot_hooks.h
diff --git a/include/asm-x86/mach-generic/gpio.h → arch/x86/include/asm/mach-generic/gpio.h b/include/asm-x86/mach-generic/gpio.h → arch/x86/include/asm/mach-generic/gpio.h
diff --git a/include/asm-x86/mach-generic/mach_apic.h → .../x86/include/asm/mach-generic/mach_apic.h b/include/asm-x86/mach-generic/mach_apic.h → .../x86/include/asm/mach-generic/mach_apic.h
diff --git a/include/asm-x86/mach-generic/mach_apicdef.h → ...6/include/asm/mach-generic/mach_apicdef.h b/include/asm-x86/mach-generic/mach_apicdef.h → ...6/include/asm/mach-generic/mach_apicdef.h
diff --git a/include/asm-x86/mach-generic/mach_ipi.h → arch/x86/include/asm/mach-generic/mach_ipi.h b/include/asm-x86/mach-generic/mach_ipi.h → arch/x86/include/asm/mach-generic/mach_ipi.h
diff --git a/include/asm-x86/mach-generic/mach_mpparse.h → ...6/include/asm/mach-generic/mach_mpparse.h b/include/asm-x86/mach-generic/mach_mpparse.h → ...6/include/asm/mach-generic/mach_mpparse.h
diff --git a/include/asm-x86/mach-generic/mach_mpspec.h → ...86/include/asm/mach-generic/mach_mpspec.h b/include/asm-x86/mach-generic/mach_mpspec.h → ...86/include/asm/mach-generic/mach_mpspec.h
diff --git a/include/asm-x86/mach-rdc321x/gpio.h → arch/x86/include/asm/mach-rdc321x/gpio.h b/include/asm-x86/mach-rdc321x/gpio.h → arch/x86/include/asm/mach-rdc321x/gpio.h
diff --git a/include/asm-x86/mach-rdc321x/rdc321x_defs.h → ...6/include/asm/mach-rdc321x/rdc321x_defs.h b/include/asm-x86/mach-rdc321x/rdc321x_defs.h → ...6/include/asm/mach-rdc321x/rdc321x_defs.h
diff --git a/include/asm-x86/mach-voyager/do_timer.h → arch/x86/include/asm/mach-voyager/do_timer.h b/include/asm-x86/mach-voyager/do_timer.h → arch/x86/include/asm/mach-voyager/do_timer.h
diff --git a/include/asm-x86/mach-voyager/entry_arch.h → ...x86/include/asm/mach-voyager/entry_arch.h b/include/asm-x86/mach-voyager/entry_arch.h → ...x86/include/asm/mach-voyager/entry_arch.h
diff --git a/include/asm-x86/mach-voyager/setup_arch.h → ...x86/include/asm/mach-voyager/setup_arch.h b/include/asm-x86/mach-voyager/setup_arch.h → ...x86/include/asm/mach-voyager/setup_arch.h
diff --git a/include/asm-x86/math_emu.h → arch/x86/include/asm/math_emu.h b/include/asm-x86/math_emu.h → arch/x86/include/asm/math_emu.h
diff --git a/include/asm-x86/mc146818rtc.h → arch/x86/include/asm/mc146818rtc.h b/include/asm-x86/mc146818rtc.h → arch/x86/include/asm/mc146818rtc.h
diff --git a/include/asm-x86/mca.h → arch/x86/include/asm/mca.h b/include/asm-x86/mca.h → arch/x86/include/asm/mca.h
diff --git a/include/asm-x86/mca_dma.h → arch/x86/include/asm/mca_dma.h b/include/asm-x86/mca_dma.h → arch/x86/include/asm/mca_dma.h
diff --git a/include/asm-x86/mce.h → arch/x86/include/asm/mce.h b/include/asm-x86/mce.h → arch/x86/include/asm/mce.h
diff --git a/include/asm-x86/microcode.h → arch/x86/include/asm/microcode.h b/include/asm-x86/microcode.h → arch/x86/include/asm/microcode.h
diff --git a/include/asm-x86/mman.h → arch/x86/include/asm/mman.h b/include/asm-x86/mman.h → arch/x86/include/asm/mman.h
diff --git a/include/asm-x86/mmconfig.h → arch/x86/include/asm/mmconfig.h b/include/asm-x86/mmconfig.h → arch/x86/include/asm/mmconfig.h
diff --git a/include/asm-x86/mmu.h → arch/x86/include/asm/mmu.h b/include/asm-x86/mmu.h → arch/x86/include/asm/mmu.h
diff --git a/include/asm-x86/mmu_context.h → arch/x86/include/asm/mmu_context.h b/include/asm-x86/mmu_context.h → arch/x86/include/asm/mmu_context.h
diff --git a/include/asm-x86/mmu_context_32.h → arch/x86/include/asm/mmu_context_32.h b/include/asm-x86/mmu_context_32.h → arch/x86/include/asm/mmu_context_32.h
diff --git a/include/asm-x86/mmu_context_64.h → arch/x86/include/asm/mmu_context_64.h b/include/asm-x86/mmu_context_64.h → arch/x86/include/asm/mmu_context_64.h
diff --git a/include/asm-x86/mmx.h → arch/x86/include/asm/mmx.h b/include/asm-x86/mmx.h → arch/x86/include/asm/mmx.h
diff --git a/include/asm-x86/mmzone.h → arch/x86/include/asm/mmzone.h b/include/asm-x86/mmzone.h → arch/x86/include/asm/mmzone.h
diff --git a/include/asm-x86/mmzone_32.h → arch/x86/include/asm/mmzone_32.h b/include/asm-x86/mmzone_32.h → arch/x86/include/asm/mmzone_32.h
diff --git a/include/asm-x86/mmzone_64.h → arch/x86/include/asm/mmzone_64.h b/include/asm-x86/mmzone_64.h → arch/x86/include/asm/mmzone_64.h
diff --git a/include/asm-x86/module.h → arch/x86/include/asm/module.h b/include/asm-x86/module.h → arch/x86/include/asm/module.h
diff --git a/include/asm-x86/mpspec.h → arch/x86/include/asm/mpspec.h b/include/asm-x86/mpspec.h → arch/x86/include/asm/mpspec.h
diff --git a/include/asm-x86/mpspec_def.h → arch/x86/include/asm/mpspec_def.h b/include/asm-x86/mpspec_def.h → arch/x86/include/asm/mpspec_def.h
diff --git a/include/asm-x86/msgbuf.h → arch/x86/include/asm/msgbuf.h b/include/asm-x86/msgbuf.h → arch/x86/include/asm/msgbuf.h
diff --git a/include/asm-x86/msidef.h → arch/x86/include/asm/msidef.h b/include/asm-x86/msidef.h → arch/x86/include/asm/msidef.h
diff --git a/include/asm-x86/msr-index.h → arch/x86/include/asm/msr-index.h b/include/asm-x86/msr-index.h → arch/x86/include/asm/msr-index.h
diff --git a/include/asm-x86/msr.h → arch/x86/include/asm/msr.h b/include/asm-x86/msr.h → arch/x86/include/asm/msr.h
diff --git a/include/asm-x86/mtrr.h → arch/x86/include/asm/mtrr.h b/include/asm-x86/mtrr.h → arch/x86/include/asm/mtrr.h
diff --git a/include/asm-x86/mutex.h → arch/x86/include/asm/mutex.h b/include/asm-x86/mutex.h → arch/x86/include/asm/mutex.h
diff --git a/include/asm-x86/mutex_32.h → arch/x86/include/asm/mutex_32.h b/include/asm-x86/mutex_32.h → arch/x86/include/asm/mutex_32.h
diff --git a/include/asm-x86/mutex_64.h → arch/x86/include/asm/mutex_64.h b/include/asm-x86/mutex_64.h → arch/x86/include/asm/mutex_64.h
diff --git a/include/asm-x86/nmi.h → arch/x86/include/asm/nmi.h b/include/asm-x86/nmi.h → arch/x86/include/asm/nmi.h
diff --git a/include/asm-x86/nops.h → arch/x86/include/asm/nops.h b/include/asm-x86/nops.h → arch/x86/include/asm/nops.h
diff --git a/include/asm-x86/numa.h → arch/x86/include/asm/numa.h b/include/asm-x86/numa.h → arch/x86/include/asm/numa.h
diff --git a/include/asm-x86/numa_32.h → arch/x86/include/asm/numa_32.h b/include/asm-x86/numa_32.h → arch/x86/include/asm/numa_32.h
diff --git a/include/asm-x86/numa_64.h → arch/x86/include/asm/numa_64.h b/include/asm-x86/numa_64.h → arch/x86/include/asm/numa_64.h
diff --git a/include/asm-x86/numaq.h → arch/x86/include/asm/numaq.h b/include/asm-x86/numaq.h → arch/x86/include/asm/numaq.h
diff --git a/include/asm-x86/numaq/apic.h → arch/x86/include/asm/numaq/apic.h b/include/asm-x86/numaq/apic.h → arch/x86/include/asm/numaq/apic.h
diff --git a/include/asm-x86/numaq/apicdef.h → arch/x86/include/asm/numaq/apicdef.h b/include/asm-x86/numaq/apicdef.h → arch/x86/include/asm/numaq/apicdef.h
diff --git a/include/asm-x86/numaq/ipi.h → arch/x86/include/asm/numaq/ipi.h b/include/asm-x86/numaq/ipi.h → arch/x86/include/asm/numaq/ipi.h
diff --git a/include/asm-x86/numaq/mpparse.h → arch/x86/include/asm/numaq/mpparse.h b/include/asm-x86/numaq/mpparse.h → arch/x86/include/asm/numaq/mpparse.h
diff --git a/include/asm-x86/numaq/wakecpu.h → arch/x86/include/asm/numaq/wakecpu.h b/include/asm-x86/numaq/wakecpu.h → arch/x86/include/asm/numaq/wakecpu.h
diff --git a/include/asm-x86/olpc.h → arch/x86/include/asm/olpc.h b/include/asm-x86/olpc.h → arch/x86/include/asm/olpc.h
diff --git a/include/asm-x86/page.h → arch/x86/include/asm/page.h b/include/asm-x86/page.h → arch/x86/include/asm/page.h
diff --git a/include/asm-x86/page_32.h → arch/x86/include/asm/page_32.h b/include/asm-x86/page_32.h → arch/x86/include/asm/page_32.h
diff --git a/include/asm-x86/page_64.h → arch/x86/include/asm/page_64.h b/include/asm-x86/page_64.h → arch/x86/include/asm/page_64.h
diff --git a/include/asm-x86/param.h → arch/x86/include/asm/param.h b/include/asm-x86/param.h → arch/x86/include/asm/param.h
diff --git a/include/asm-x86/paravirt.h → arch/x86/include/asm/paravirt.h b/include/asm-x86/paravirt.h → arch/x86/include/asm/paravirt.h
diff --git a/include/asm-x86/parport.h → arch/x86/include/asm/parport.h b/include/asm-x86/parport.h → arch/x86/include/asm/parport.h
diff --git a/include/asm-x86/pat.h → arch/x86/include/asm/pat.h b/include/asm-x86/pat.h → arch/x86/include/asm/pat.h
diff --git a/include/asm-x86/pci-direct.h → arch/x86/include/asm/pci-direct.h b/include/asm-x86/pci-direct.h → arch/x86/include/asm/pci-direct.h
diff --git a/include/asm-x86/pci.h → arch/x86/include/asm/pci.h b/include/asm-x86/pci.h → arch/x86/include/asm/pci.h
diff --git a/include/asm-x86/pci_32.h → arch/x86/include/asm/pci_32.h b/include/asm-x86/pci_32.h → arch/x86/include/asm/pci_32.h
diff --git a/include/asm-x86/pci_64.h → arch/x86/include/asm/pci_64.h b/include/asm-x86/pci_64.h → arch/x86/include/asm/pci_64.h
diff --git a/include/asm-x86/pda.h → arch/x86/include/asm/pda.h b/include/asm-x86/pda.h → arch/x86/include/asm/pda.h
diff --git a/include/asm-x86/percpu.h → arch/x86/include/asm/percpu.h b/include/asm-x86/percpu.h → arch/x86/include/asm/percpu.h
diff --git a/include/asm-x86/pgalloc.h → arch/x86/include/asm/pgalloc.h b/include/asm-x86/pgalloc.h → arch/x86/include/asm/pgalloc.h
diff --git a/include/asm-x86/pgtable-2level-defs.h → arch/x86/include/asm/pgtable-2level-defs.h b/include/asm-x86/pgtable-2level-defs.h → arch/x86/include/asm/pgtable-2level-defs.h
diff --git a/include/asm-x86/pgtable-2level.h → arch/x86/include/asm/pgtable-2level.h b/include/asm-x86/pgtable-2level.h → arch/x86/include/asm/pgtable-2level.h
diff --git a/include/asm-x86/pgtable-3level-defs.h → arch/x86/include/asm/pgtable-3level-defs.h b/include/asm-x86/pgtable-3level-defs.h → arch/x86/include/asm/pgtable-3level-defs.h
diff --git a/include/asm-x86/pgtable-3level.h → arch/x86/include/asm/pgtable-3level.h b/include/asm-x86/pgtable-3level.h → arch/x86/include/asm/pgtable-3level.h
diff --git a/include/asm-x86/pgtable.h → arch/x86/include/asm/pgtable.h b/include/asm-x86/pgtable.h → arch/x86/include/asm/pgtable.h
diff --git a/include/asm-x86/pgtable_32.h → arch/x86/include/asm/pgtable_32.h b/include/asm-x86/pgtable_32.h → arch/x86/include/asm/pgtable_32.h
diff --git a/include/asm-x86/pgtable_64.h → arch/x86/include/asm/pgtable_64.h b/include/asm-x86/pgtable_64.h → arch/x86/include/asm/pgtable_64.h
diff --git a/include/asm-x86/poll.h → arch/x86/include/asm/poll.h b/include/asm-x86/poll.h → arch/x86/include/asm/poll.h
diff --git a/include/asm-x86/posix_types.h → arch/x86/include/asm/posix_types.h b/include/asm-x86/posix_types.h → arch/x86/include/asm/posix_types.h
diff --git a/include/asm-x86/posix_types_32.h → arch/x86/include/asm/posix_types_32.h b/include/asm-x86/posix_types_32.h → arch/x86/include/asm/posix_types_32.h
diff --git a/include/asm-x86/posix_types_64.h → arch/x86/include/asm/posix_types_64.h b/include/asm-x86/posix_types_64.h → arch/x86/include/asm/posix_types_64.h
diff --git a/include/asm-x86/prctl.h → arch/x86/include/asm/prctl.h b/include/asm-x86/prctl.h → arch/x86/include/asm/prctl.h
diff --git a/include/asm-x86/processor-cyrix.h → arch/x86/include/asm/processor-cyrix.h b/include/asm-x86/processor-cyrix.h → arch/x86/include/asm/processor-cyrix.h
diff --git a/include/asm-x86/processor-flags.h → arch/x86/include/asm/processor-flags.h b/include/asm-x86/processor-flags.h → arch/x86/include/asm/processor-flags.h
diff --git a/include/asm-x86/processor.h → arch/x86/include/asm/processor.h b/include/asm-x86/processor.h → arch/x86/include/asm/processor.h
diff --git a/include/asm-x86/proto.h → arch/x86/include/asm/proto.h b/include/asm-x86/proto.h → arch/x86/include/asm/proto.h
diff --git a/include/asm-x86/ptrace-abi.h → arch/x86/include/asm/ptrace-abi.h b/include/asm-x86/ptrace-abi.h → arch/x86/include/asm/ptrace-abi.h
diff --git a/include/asm-x86/ptrace.h → arch/x86/include/asm/ptrace.h b/include/asm-x86/ptrace.h → arch/x86/include/asm/ptrace.h
diff --git a/include/asm-x86/pvclock-abi.h → arch/x86/include/asm/pvclock-abi.h b/include/asm-x86/pvclock-abi.h → arch/x86/include/asm/pvclock-abi.h
diff --git a/include/asm-x86/pvclock.h → arch/x86/include/asm/pvclock.h b/include/asm-x86/pvclock.h → arch/x86/include/asm/pvclock.h
diff --git a/include/asm-x86/reboot.h → arch/x86/include/asm/reboot.h b/include/asm-x86/reboot.h → arch/x86/include/asm/reboot.h
diff --git a/include/asm-x86/reboot_fixups.h → arch/x86/include/asm/reboot_fixups.h b/include/asm-x86/reboot_fixups.h → arch/x86/include/asm/reboot_fixups.h
diff --git a/include/asm-x86/required-features.h → arch/x86/include/asm/required-features.h b/include/asm-x86/required-features.h → arch/x86/include/asm/required-features.h
diff --git a/include/asm-x86/resource.h → arch/x86/include/asm/resource.h b/include/asm-x86/resource.h → arch/x86/include/asm/resource.h
diff --git a/include/asm-x86/resume-trace.h → arch/x86/include/asm/resume-trace.h b/include/asm-x86/resume-trace.h → arch/x86/include/asm/resume-trace.h
diff --git a/include/asm-x86/rio.h → arch/x86/include/asm/rio.h b/include/asm-x86/rio.h → arch/x86/include/asm/rio.h
diff --git a/include/asm-x86/rtc.h → arch/x86/include/asm/rtc.h b/include/asm-x86/rtc.h → arch/x86/include/asm/rtc.h
diff --git a/include/asm-x86/rwlock.h → arch/x86/include/asm/rwlock.h b/include/asm-x86/rwlock.h → arch/x86/include/asm/rwlock.h
diff --git a/include/asm-x86/rwsem.h → arch/x86/include/asm/rwsem.h b/include/asm-x86/rwsem.h → arch/x86/include/asm/rwsem.h
diff --git a/include/asm-x86/scatterlist.h → arch/x86/include/asm/scatterlist.h b/include/asm-x86/scatterlist.h → arch/x86/include/asm/scatterlist.h
diff --git a/include/asm-x86/seccomp.h → arch/x86/include/asm/seccomp.h b/include/asm-x86/seccomp.h → arch/x86/include/asm/seccomp.h
diff --git a/include/asm-x86/seccomp_32.h → arch/x86/include/asm/seccomp_32.h b/include/asm-x86/seccomp_32.h → arch/x86/include/asm/seccomp_32.h
diff --git a/include/asm-x86/seccomp_64.h → arch/x86/include/asm/seccomp_64.h b/include/asm-x86/seccomp_64.h → arch/x86/include/asm/seccomp_64.h
diff --git a/include/asm-x86/sections.h → arch/x86/include/asm/sections.h b/include/asm-x86/sections.h → arch/x86/include/asm/sections.h
diff --git a/include/asm-x86/segment.h → arch/x86/include/asm/segment.h b/include/asm-x86/segment.h → arch/x86/include/asm/segment.h
diff --git a/include/asm-x86/sembuf.h → arch/x86/include/asm/sembuf.h b/include/asm-x86/sembuf.h → arch/x86/include/asm/sembuf.h
diff --git a/include/asm-x86/serial.h → arch/x86/include/asm/serial.h b/include/asm-x86/serial.h → arch/x86/include/asm/serial.h
diff --git a/include/asm-x86/setup.h → arch/x86/include/asm/setup.h b/include/asm-x86/setup.h → arch/x86/include/asm/setup.h
diff --git a/include/asm-x86/shmbuf.h → arch/x86/include/asm/shmbuf.h b/include/asm-x86/shmbuf.h → arch/x86/include/asm/shmbuf.h
diff --git a/include/asm-x86/shmparam.h → arch/x86/include/asm/shmparam.h b/include/asm-x86/shmparam.h → arch/x86/include/asm/shmparam.h
diff --git a/include/asm-x86/sigcontext.h → arch/x86/include/asm/sigcontext.h b/include/asm-x86/sigcontext.h → arch/x86/include/asm/sigcontext.h
diff --git a/include/asm-x86/sigcontext32.h → arch/x86/include/asm/sigcontext32.h b/include/asm-x86/sigcontext32.h → arch/x86/include/asm/sigcontext32.h
diff --git a/include/asm-x86/siginfo.h → arch/x86/include/asm/siginfo.h b/include/asm-x86/siginfo.h → arch/x86/include/asm/siginfo.h
diff --git a/include/asm-x86/signal.h → arch/x86/include/asm/signal.h b/include/asm-x86/signal.h → arch/x86/include/asm/signal.h
diff --git a/include/asm-x86/smp.h → arch/x86/include/asm/smp.h b/include/asm-x86/smp.h → arch/x86/include/asm/smp.h
diff --git a/include/asm-x86/socket.h → arch/x86/include/asm/socket.h b/include/asm-x86/socket.h → arch/x86/include/asm/socket.h
diff --git a/include/asm-x86/sockios.h → arch/x86/include/asm/sockios.h b/include/asm-x86/sockios.h → arch/x86/include/asm/sockios.h
diff --git a/include/asm-x86/sparsemem.h → arch/x86/include/asm/sparsemem.h b/include/asm-x86/sparsemem.h → arch/x86/include/asm/sparsemem.h
diff --git a/include/asm-x86/spinlock.h → arch/x86/include/asm/spinlock.h b/include/asm-x86/spinlock.h → arch/x86/include/asm/spinlock.h
diff --git a/include/asm-x86/spinlock_types.h → arch/x86/include/asm/spinlock_types.h b/include/asm-x86/spinlock_types.h → arch/x86/include/asm/spinlock_types.h
diff --git a/include/asm-x86/srat.h → arch/x86/include/asm/srat.h b/include/asm-x86/srat.h → arch/x86/include/asm/srat.h
diff --git a/include/asm-x86/stacktrace.h → arch/x86/include/asm/stacktrace.h b/include/asm-x86/stacktrace.h → arch/x86/include/asm/stacktrace.h
diff --git a/include/asm-x86/stat.h → arch/x86/include/asm/stat.h b/include/asm-x86/stat.h → arch/x86/include/asm/stat.h
diff --git a/include/asm-x86/statfs.h → arch/x86/include/asm/statfs.h b/include/asm-x86/statfs.h → arch/x86/include/asm/statfs.h
diff --git a/include/asm-x86/string.h → arch/x86/include/asm/string.h b/include/asm-x86/string.h → arch/x86/include/asm/string.h
diff --git a/include/asm-x86/string_32.h → arch/x86/include/asm/string_32.h b/include/asm-x86/string_32.h → arch/x86/include/asm/string_32.h
diff --git a/include/asm-x86/string_64.h → arch/x86/include/asm/string_64.h b/include/asm-x86/string_64.h → arch/x86/include/asm/string_64.h
diff --git a/include/asm-x86/summit/apic.h → arch/x86/include/asm/summit/apic.h b/include/asm-x86/summit/apic.h → arch/x86/include/asm/summit/apic.h
diff --git a/include/asm-x86/summit/apicdef.h → arch/x86/include/asm/summit/apicdef.h b/include/asm-x86/summit/apicdef.h → arch/x86/include/asm/summit/apicdef.h
diff --git a/include/asm-x86/summit/ipi.h → arch/x86/include/asm/summit/ipi.h b/include/asm-x86/summit/ipi.h → arch/x86/include/asm/summit/ipi.h
diff --git a/include/asm-x86/summit/mpparse.h → arch/x86/include/asm/summit/mpparse.h b/include/asm-x86/summit/mpparse.h → arch/x86/include/asm/summit/mpparse.h
diff --git a/include/asm-x86/suspend.h → arch/x86/include/asm/suspend.h b/include/asm-x86/suspend.h → arch/x86/include/asm/suspend.h
diff --git a/include/asm-x86/suspend_32.h → arch/x86/include/asm/suspend_32.h b/include/asm-x86/suspend_32.h → arch/x86/include/asm/suspend_32.h
diff --git a/include/asm-x86/suspend_64.h → arch/x86/include/asm/suspend_64.h b/include/asm-x86/suspend_64.h → arch/x86/include/asm/suspend_64.h
diff --git a/include/asm-x86/swiotlb.h → arch/x86/include/asm/swiotlb.h b/include/asm-x86/swiotlb.h → arch/x86/include/asm/swiotlb.h
diff --git a/include/asm-x86/sync_bitops.h → arch/x86/include/asm/sync_bitops.h b/include/asm-x86/sync_bitops.h → arch/x86/include/asm/sync_bitops.h
diff --git a/include/asm-x86/syscall.h → arch/x86/include/asm/syscall.h b/include/asm-x86/syscall.h → arch/x86/include/asm/syscall.h
diff --git a/include/asm-x86/syscalls.h → arch/x86/include/asm/syscalls.h b/include/asm-x86/syscalls.h → arch/x86/include/asm/syscalls.h
diff --git a/include/asm-x86/system.h → arch/x86/include/asm/system.h b/include/asm-x86/system.h → arch/x86/include/asm/system.h
diff --git a/include/asm-x86/system_64.h → arch/x86/include/asm/system_64.h b/include/asm-x86/system_64.h → arch/x86/include/asm/system_64.h
diff --git a/include/asm-x86/tce.h → arch/x86/include/asm/tce.h b/include/asm-x86/tce.h → arch/x86/include/asm/tce.h
diff --git a/include/asm-x86/termbits.h → arch/x86/include/asm/termbits.h b/include/asm-x86/termbits.h → arch/x86/include/asm/termbits.h
diff --git a/include/asm-x86/termios.h → arch/x86/include/asm/termios.h b/include/asm-x86/termios.h → arch/x86/include/asm/termios.h
diff --git a/include/asm-x86/therm_throt.h → arch/x86/include/asm/therm_throt.h b/include/asm-x86/therm_throt.h → arch/x86/include/asm/therm_throt.h
diff --git a/include/asm-x86/thread_info.h → arch/x86/include/asm/thread_info.h b/include/asm-x86/thread_info.h → arch/x86/include/asm/thread_info.h
diff --git a/include/asm-x86/time.h → arch/x86/include/asm/time.h b/include/asm-x86/time.h → arch/x86/include/asm/time.h
diff --git a/include/asm-x86/timer.h → arch/x86/include/asm/timer.h b/include/asm-x86/timer.h → arch/x86/include/asm/timer.h
diff --git a/include/asm-x86/timex.h → arch/x86/include/asm/timex.h b/include/asm-x86/timex.h → arch/x86/include/asm/timex.h
diff --git a/include/asm-x86/tlb.h → arch/x86/include/asm/tlb.h b/include/asm-x86/tlb.h → arch/x86/include/asm/tlb.h
diff --git a/include/asm-x86/tlbflush.h → arch/x86/include/asm/tlbflush.h b/include/asm-x86/tlbflush.h → arch/x86/include/asm/tlbflush.h
diff --git a/include/asm-x86/topology.h → arch/x86/include/asm/topology.h b/include/asm-x86/topology.h → arch/x86/include/asm/topology.h
diff --git a/include/asm-x86/trampoline.h → arch/x86/include/asm/trampoline.h b/include/asm-x86/trampoline.h → arch/x86/include/asm/trampoline.h
diff --git a/include/asm-x86/traps.h → arch/x86/include/asm/traps.h b/include/asm-x86/traps.h → arch/x86/include/asm/traps.h
diff --git a/include/asm-x86/tsc.h → arch/x86/include/asm/tsc.h b/include/asm-x86/tsc.h → arch/x86/include/asm/tsc.h
diff --git a/include/asm-x86/types.h → arch/x86/include/asm/types.h b/include/asm-x86/types.h → arch/x86/include/asm/types.h
diff --git a/include/asm-x86/uaccess.h → arch/x86/include/asm/uaccess.h b/include/asm-x86/uaccess.h → arch/x86/include/asm/uaccess.h
diff --git a/include/asm-x86/uaccess_32.h → arch/x86/include/asm/uaccess_32.h b/include/asm-x86/uaccess_32.h → arch/x86/include/asm/uaccess_32.h
diff --git a/include/asm-x86/uaccess_64.h → arch/x86/include/asm/uaccess_64.h b/include/asm-x86/uaccess_64.h → arch/x86/include/asm/uaccess_64.h
diff --git a/include/asm-x86/ucontext.h → arch/x86/include/asm/ucontext.h b/include/asm-x86/ucontext.h → arch/x86/include/asm/ucontext.h
diff --git a/include/asm-x86/unaligned.h → arch/x86/include/asm/unaligned.h b/include/asm-x86/unaligned.h → arch/x86/include/asm/unaligned.h
diff --git a/include/asm-x86/unistd.h → arch/x86/include/asm/unistd.h b/include/asm-x86/unistd.h → arch/x86/include/asm/unistd.h
diff --git a/include/asm-x86/unistd_32.h → arch/x86/include/asm/unistd_32.h b/include/asm-x86/unistd_32.h → arch/x86/include/asm/unistd_32.h