340 files changed, 11 insertions, 11 deletions

diff --git a/arch/ia64/ia32/audit.c b/arch/ia64/ia32/audit.c
index 5e901c7..5c93ddd 100644
--- 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 94fb24e..4fc79f3 100644
--- 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 32f5fbe..ef42ec0 100644
--- 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 f5631da..d1a47ad 100644
--- 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
index 4a8e80c..4a8e80c 100644
--- a/include/asm-x86/Kbuild
+++ b/arch/x86/include/asm/Kbuild
diff --git a/include/asm-x86/a.out-core.h b/arch/x86/include/asm/a.out-core.h
index f570576..f570576 100644
--- a/include/asm-x86/a.out-core.h
+++ b/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
index 0948748..0948748 100644
--- a/include/asm-x86/a.out.h
+++ b/arch/x86/include/asm/a.out.h
diff --git a/include/asm-x86/acpi.h b/arch/x86/include/asm/acpi.h
index 392e173..392e173 100644
--- a/include/asm-x86/acpi.h
+++ b/arch/x86/include/asm/acpi.h
diff --git a/include/asm-x86/agp.h b/arch/x86/include/asm/agp.h
index 3617fd4..3617fd4 100644
--- a/include/asm-x86/agp.h
+++ b/arch/x86/include/asm/agp.h
diff --git a/include/asm-x86/alternative-asm.h b/arch/x86/include/asm/alternative-asm.h
index e2077d3..e2077d3 100644
--- a/include/asm-x86/alternative-asm.h
+++ b/arch/x86/include/asm/alternative-asm.h
diff --git a/include/asm-x86/alternative.h b/arch/x86/include/asm/alternative.h
index 22d3c98..22d3c98 100644
--- a/include/asm-x86/alternative.h
+++ b/arch/x86/include/asm/alternative.h
diff --git a/include/asm-x86/amd_iommu.h b/arch/x86/include/asm/amd_iommu.h
index 041d0db..041d0db 100644
--- a/include/asm-x86/amd_iommu.h
+++ b/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
index b308586..b308586 100644
--- a/include/asm-x86/amd_iommu_types.h
+++ b/arch/x86/include/asm/amd_iommu_types.h
diff --git a/include/asm-x86/apic.h b/arch/x86/include/asm/apic.h
index ef1d72d..ef1d72d 100644
--- a/include/asm-x86/apic.h
+++ b/arch/x86/include/asm/apic.h
diff --git a/include/asm-x86/apicdef.h b/arch/x86/include/asm/apicdef.h
index b922c85..b922c85 100644
--- a/include/asm-x86/apicdef.h
+++ b/arch/x86/include/asm/apicdef.h
diff --git a/include/asm-x86/arch_hooks.h b/arch/x86/include/asm/arch_hooks.h
index de4596b..de4596b 100644
--- a/include/asm-x86/arch_hooks.h
+++ b/arch/x86/include/asm/arch_hooks.h
diff --git a/include/asm-x86/asm.h b/arch/x86/include/asm/asm.h
index e1355f4..e1355f4 100644
--- a/include/asm-x86/asm.h
+++ b/arch/x86/include/asm/asm.h
diff --git a/include/asm-x86/atomic.h b/arch/x86/include/asm/atomic.h
index 4e1b887..4e1b887 100644
--- a/include/asm-x86/atomic.h
+++ b/arch/x86/include/asm/atomic.h
diff --git a/include/asm-x86/atomic_32.h b/arch/x86/include/asm/atomic_32.h
index 14d3f0b..14d3f0b 100644
--- a/include/asm-x86/atomic_32.h
+++ b/arch/x86/include/asm/atomic_32.h
diff --git a/include/asm-x86/atomic_64.h b/arch/x86/include/asm/atomic_64.h
index 2cb218c..2cb218c 100644
--- a/include/asm-x86/atomic_64.h
+++ b/arch/x86/include/asm/atomic_64.h
diff --git a/include/asm-x86/auxvec.h b/arch/x86/include/asm/auxvec.h
index 12c7cac..12c7cac 100644
--- a/include/asm-x86/auxvec.h
+++ b/arch/x86/include/asm/auxvec.h
diff --git a/include/asm-x86/bigsmp/apic.h b/arch/x86/include/asm/bigsmp/apic.h
index 1d9543b..1d9543b 100644
--- a/include/asm-x86/bigsmp/apic.h
+++ b/arch/x86/include/asm/bigsmp/apic.h
diff --git a/include/asm-x86/bigsmp/apicdef.h b/arch/x86/include/asm/bigsmp/apicdef.h
index 392c3f5..392c3f5 100644
--- a/include/asm-x86/bigsmp/apicdef.h
+++ b/arch/x86/include/asm/bigsmp/apicdef.h
diff --git a/include/asm-x86/bigsmp/ipi.h b/arch/x86/include/asm/bigsmp/ipi.h
index 9404c53..9404c53 100644
--- a/include/asm-x86/bigsmp/ipi.h
+++ b/arch/x86/include/asm/bigsmp/ipi.h
diff --git a/include/asm-x86/bios_ebda.h b/arch/x86/include/asm/bios_ebda.h
index 79b4b88..79b4b88 100644
--- a/include/asm-x86/bios_ebda.h
+++ b/arch/x86/include/asm/bios_ebda.h
diff --git a/include/asm-x86/bitops.h b/arch/x86/include/asm/bitops.h
index 451a747..451a747 100644
--- a/include/asm-x86/bitops.h
+++ b/arch/x86/include/asm/bitops.h
diff --git a/include/asm-x86/boot.h b/arch/x86/include/asm/boot.h
index 1d63bd5..1d63bd5 100644
--- a/include/asm-x86/boot.h
+++ b/arch/x86/include/asm/boot.h
diff --git a/include/asm-x86/bootparam.h b/arch/x86/include/asm/bootparam.h
index ccf027e..ccf027e 100644
--- a/include/asm-x86/bootparam.h
+++ b/arch/x86/include/asm/bootparam.h
diff --git a/include/asm-x86/bug.h b/arch/x86/include/asm/bug.h
index 91ad43a..91ad43a 100644
--- a/include/asm-x86/bug.h
+++ b/arch/x86/include/asm/bug.h
diff --git a/include/asm-x86/bugs.h b/arch/x86/include/asm/bugs.h
index dc60498..dc60498 100644
--- a/include/asm-x86/bugs.h
+++ b/arch/x86/include/asm/bugs.h
diff --git a/include/asm-x86/byteorder.h b/arch/x86/include/asm/byteorder.h
index 722f27d..722f27d 100644
--- a/include/asm-x86/byteorder.h
+++ b/arch/x86/include/asm/byteorder.h
diff --git a/include/asm-x86/cache.h b/arch/x86/include/asm/cache.h
index ea3f1cc..ea3f1cc 100644
--- a/include/asm-x86/cache.h
+++ b/arch/x86/include/asm/cache.h
diff --git a/include/asm-x86/cacheflush.h b/arch/x86/include/asm/cacheflush.h
index 68840ef..68840ef 100644
--- a/include/asm-x86/cacheflush.h
+++ b/arch/x86/include/asm/cacheflush.h
diff --git a/include/asm-x86/calgary.h b/arch/x86/include/asm/calgary.h
index 933fd27..933fd27 100644
--- a/include/asm-x86/calgary.h
+++ b/arch/x86/include/asm/calgary.h
diff --git a/include/asm-x86/calling.h b/arch/x86/include/asm/calling.h
index 2bc162e..2bc162e 100644
--- a/include/asm-x86/calling.h
+++ b/arch/x86/include/asm/calling.h
diff --git a/include/asm-x86/checksum.h b/arch/x86/include/asm/checksum.h
index 848850f..848850f 100644
--- a/include/asm-x86/checksum.h
+++ b/arch/x86/include/asm/checksum.h
diff --git a/include/asm-x86/checksum_32.h b/arch/x86/include/asm/checksum_32.h
index d041e8c..d041e8c 100644
--- a/include/asm-x86/checksum_32.h
+++ b/arch/x86/include/asm/checksum_32.h
diff --git a/include/asm-x86/checksum_64.h b/arch/x86/include/asm/checksum_64.h
index 110f403..110f403 100644
--- a/include/asm-x86/checksum_64.h
+++ b/arch/x86/include/asm/checksum_64.h
diff --git a/include/asm-x86/cmpxchg.h b/arch/x86/include/asm/cmpxchg.h
index a460fa0..a460fa0 100644
--- a/include/asm-x86/cmpxchg.h
+++ b/arch/x86/include/asm/cmpxchg.h
diff --git a/include/asm-x86/cmpxchg_32.h b/arch/x86/include/asm/cmpxchg_32.h
index 0622e45..0622e45 100644
--- a/include/asm-x86/cmpxchg_32.h
+++ b/arch/x86/include/asm/cmpxchg_32.h
diff --git a/include/asm-x86/cmpxchg_64.h b/arch/x86/include/asm/cmpxchg_64.h
index 63c1a5e..63c1a5e 100644
--- a/include/asm-x86/cmpxchg_64.h
+++ b/arch/x86/include/asm/cmpxchg_64.h
diff --git a/include/asm-x86/compat.h b/arch/x86/include/asm/compat.h
index 6732b15..6732b15 100644
--- a/include/asm-x86/compat.h
+++ b/arch/x86/include/asm/compat.h
diff --git a/include/asm-x86/cpu.h b/arch/x86/include/asm/cpu.h
index 83a1150..83a1150 100644
--- a/include/asm-x86/cpu.h
+++ b/arch/x86/include/asm/cpu.h
diff --git a/include/asm-x86/cpufeature.h b/arch/x86/include/asm/cpufeature.h
index adfeae6..adfeae6 100644
--- a/include/asm-x86/cpufeature.h
+++ b/arch/x86/include/asm/cpufeature.h
diff --git a/include/asm-x86/cputime.h b/arch/x86/include/asm/cputime.h
index 6d68ad7..6d68ad7 100644
--- a/include/asm-x86/cputime.h
+++ b/arch/x86/include/asm/cputime.h
diff --git a/include/asm-x86/current.h b/arch/x86/include/asm/current.h
index a863ead..a863ead 100644
--- a/include/asm-x86/current.h
+++ b/arch/x86/include/asm/current.h
diff --git a/include/asm-x86/debugreg.h b/arch/x86/include/asm/debugreg.h
index ecb6907..ecb6907 100644
--- a/include/asm-x86/debugreg.h
+++ b/arch/x86/include/asm/debugreg.h
diff --git a/include/asm-x86/delay.h b/arch/x86/include/asm/delay.h
index 8a0da95..8a0da95 100644
--- a/include/asm-x86/delay.h
+++ b/arch/x86/include/asm/delay.h
diff --git a/include/asm-x86/desc.h b/arch/x86/include/asm/desc.h
index f06adac..f06adac 100644
--- a/include/asm-x86/desc.h
+++ b/arch/x86/include/asm/desc.h
diff --git a/include/asm-x86/desc_defs.h b/arch/x86/include/asm/desc_defs.h
index b881db6..b881db6 100644
--- a/include/asm-x86/desc_defs.h
+++ b/arch/x86/include/asm/desc_defs.h
diff --git a/include/asm-x86/device.h b/arch/x86/include/asm/device.h
index 1bece04..1bece04 100644
--- a/include/asm-x86/device.h
+++ b/arch/x86/include/asm/device.h
diff --git a/include/asm-x86/div64.h b/arch/x86/include/asm/div64.h
index f9530f2..f9530f2 100644
--- a/include/asm-x86/div64.h
+++ b/arch/x86/include/asm/div64.h
diff --git a/include/asm-x86/dma-mapping.h b/arch/x86/include/asm/dma-mapping.h
index 219c33d..219c33d 100644
--- a/include/asm-x86/dma-mapping.h
+++ b/arch/x86/include/asm/dma-mapping.h
diff --git a/include/asm-x86/dma.h b/arch/x86/include/asm/dma.h
index c9f7a4e..c9f7a4e 100644
--- a/include/asm-x86/dma.h
+++ b/arch/x86/include/asm/dma.h
diff --git a/include/asm-x86/dmi.h b/arch/x86/include/asm/dmi.h
index 1cff6fe..1cff6fe 100644
--- a/include/asm-x86/dmi.h
+++ b/arch/x86/include/asm/dmi.h
diff --git a/include/asm-x86/ds.h b/arch/x86/include/asm/ds.h
index c3c953a..c3c953a 100644
--- a/include/asm-x86/ds.h
+++ b/arch/x86/include/asm/ds.h
diff --git a/include/asm-x86/dwarf2.h b/arch/x86/include/asm/dwarf2.h
index 21d1bc3..21d1bc3 100644
--- a/include/asm-x86/dwarf2.h
+++ b/arch/x86/include/asm/dwarf2.h
diff --git a/include/asm-x86/e820.h b/arch/x86/include/asm/e820.h
index 5abbdec..5abbdec 100644
--- a/include/asm-x86/e820.h
+++ b/arch/x86/include/asm/e820.h
diff --git a/include/asm-x86/edac.h b/arch/x86/include/asm/edac.h
index 9493c5b..9493c5b 100644
--- a/include/asm-x86/edac.h
+++ b/arch/x86/include/asm/edac.h
diff --git a/include/asm-x86/efi.h b/arch/x86/include/asm/efi.h
index 313438e..313438e 100644
--- a/include/asm-x86/efi.h
+++ b/arch/x86/include/asm/efi.h
diff --git a/include/asm-x86/elf.h b/arch/x86/include/asm/elf.h
index 26bc15f..26bc15f 100644
--- a/include/asm-x86/elf.h
+++ b/arch/x86/include/asm/elf.h
diff --git a/include/asm-x86/emergency-restart.h b/arch/x86/include/asm/emergency-restart.h
index 190d0d8..190d0d8 100644
--- a/include/asm-x86/emergency-restart.h
+++ b/arch/x86/include/asm/emergency-restart.h
diff --git a/include/asm-x86/errno.h b/arch/x86/include/asm/errno.h
index 4c82b50..4c82b50 100644
--- a/include/asm-x86/errno.h
+++ b/arch/x86/include/asm/errno.h
diff --git a/include/asm-x86/es7000/apic.h b/arch/x86/include/asm/es7000/apic.h
index 380f0b4..380f0b4 100644
--- a/include/asm-x86/es7000/apic.h
+++ b/arch/x86/include/asm/es7000/apic.h
diff --git a/include/asm-x86/es7000/apicdef.h b/arch/x86/include/asm/es7000/apicdef.h
index 8b234a3..8b234a3 100644
--- a/include/asm-x86/es7000/apicdef.h
+++ b/arch/x86/include/asm/es7000/apicdef.h
diff --git a/include/asm-x86/es7000/ipi.h b/arch/x86/include/asm/es7000/ipi.h
index 632a955..632a955 100644
--- a/include/asm-x86/es7000/ipi.h
+++ b/arch/x86/include/asm/es7000/ipi.h
diff --git a/include/asm-x86/es7000/mpparse.h b/arch/x86/include/asm/es7000/mpparse.h
index ed5a3ca..ed5a3ca 100644
--- a/include/asm-x86/es7000/mpparse.h
+++ b/arch/x86/include/asm/es7000/mpparse.h
diff --git a/include/asm-x86/es7000/wakecpu.h b/arch/x86/include/asm/es7000/wakecpu.h
index 3ffc5a7..3ffc5a7 100644
--- a/include/asm-x86/es7000/wakecpu.h
+++ b/arch/x86/include/asm/es7000/wakecpu.h
diff --git a/include/asm-x86/fb.h b/arch/x86/include/asm/fb.h
index aca38dbd..aca38dbd 100644
--- a/include/asm-x86/fb.h
+++ b/arch/x86/include/asm/fb.h
diff --git a/include/asm-x86/fcntl.h b/arch/x86/include/asm/fcntl.h
index 46ab12d..46ab12d 100644
--- a/include/asm-x86/fcntl.h
+++ b/arch/x86/include/asm/fcntl.h
diff --git a/include/asm-x86/fixmap.h b/arch/x86/include/asm/fixmap.h
index 78e33a1..78e33a1 100644
--- a/include/asm-x86/fixmap.h
+++ b/arch/x86/include/asm/fixmap.h
diff --git a/include/asm-x86/fixmap_32.h b/arch/x86/include/asm/fixmap_32.h
index 8844002..8844002 100644
--- a/include/asm-x86/fixmap_32.h
+++ b/arch/x86/include/asm/fixmap_32.h
diff --git a/include/asm-x86/fixmap_64.h b/arch/x86/include/asm/fixmap_64.h
index dab4751..dab4751 100644
--- a/include/asm-x86/fixmap_64.h
+++ b/arch/x86/include/asm/fixmap_64.h
diff --git a/include/asm-x86/floppy.h b/arch/x86/include/asm/floppy.h
index 7d83a3a..7d83a3a 100644
--- a/include/asm-x86/floppy.h
+++ b/arch/x86/include/asm/floppy.h
diff --git a/include/asm-x86/frame.h b/arch/x86/include/asm/frame.h
index 06850a7..06850a7 100644
--- a/include/asm-x86/frame.h
+++ b/arch/x86/include/asm/frame.h
diff --git a/include/asm-x86/ftrace.h b/arch/x86/include/asm/ftrace.h
index 1bb6f9bb..1bb6f9bb 100644
--- a/include/asm-x86/ftrace.h
+++ b/arch/x86/include/asm/ftrace.h
diff --git a/include/asm-x86/futex.h b/arch/x86/include/asm/futex.h
index 06b924e..06b924e 100644
--- a/include/asm-x86/futex.h
+++ b/arch/x86/include/asm/futex.h
diff --git a/include/asm-x86/gart.h b/arch/x86/include/asm/gart.h
index 605edb3..605edb3 100644
--- a/include/asm-x86/gart.h
+++ b/arch/x86/include/asm/gart.h
diff --git a/include/asm-x86/genapic.h b/arch/x86/include/asm/genapic.h
index d48bee6..d48bee6 100644
--- a/include/asm-x86/genapic.h
+++ b/arch/x86/include/asm/genapic.h
diff --git a/include/asm-x86/genapic_32.h b/arch/x86/include/asm/genapic_32.h
index 6fe4f81..6fe4f81 100644
--- a/include/asm-x86/genapic_32.h
+++ b/arch/x86/include/asm/genapic_32.h
diff --git a/include/asm-x86/genapic_64.h b/arch/x86/include/asm/genapic_64.h
index ed6a488..ed6a488 100644
--- a/include/asm-x86/genapic_64.h
+++ b/arch/x86/include/asm/genapic_64.h
diff --git a/include/asm-x86/geode.h b/arch/x86/include/asm/geode.h
index 3f3444b..3f3444b 100644
--- a/include/asm-x86/geode.h
+++ b/arch/x86/include/asm/geode.h
diff --git a/include/asm-x86/gpio.h b/arch/x86/include/asm/gpio.h
index 497fb98..497fb98 100644
--- a/include/asm-x86/gpio.h
+++ b/arch/x86/include/asm/gpio.h
diff --git a/include/asm-x86/hardirq.h b/arch/x86/include/asm/hardirq.h
index 000787d..000787d 100644
--- a/include/asm-x86/hardirq.h
+++ b/arch/x86/include/asm/hardirq.h
diff --git a/include/asm-x86/hardirq_32.h b/arch/x86/include/asm/hardirq_32.h
index 700fe23..700fe23 100644
--- a/include/asm-x86/hardirq_32.h
+++ b/arch/x86/include/asm/hardirq_32.h
diff --git a/include/asm-x86/hardirq_64.h b/arch/x86/include/asm/hardirq_64.h
index f8bd291..f8bd291 100644
--- a/include/asm-x86/hardirq_64.h
+++ b/arch/x86/include/asm/hardirq_64.h
diff --git a/include/asm-x86/highmem.h b/arch/x86/include/asm/highmem.h
index bc3f6a2..bc3f6a2 100644
--- a/include/asm-x86/highmem.h
+++ b/arch/x86/include/asm/highmem.h
diff --git a/include/asm-x86/hpet.h b/arch/x86/include/asm/hpet.h
index 58b273f..58b273f 100644
--- a/include/asm-x86/hpet.h
+++ b/arch/x86/include/asm/hpet.h
diff --git a/include/asm-x86/hugetlb.h b/arch/x86/include/asm/hugetlb.h
index 0b7ec5d..0b7ec5d 100644
--- a/include/asm-x86/hugetlb.h
+++ b/arch/x86/include/asm/hugetlb.h
diff --git a/include/asm-x86/hw_irq.h b/arch/x86/include/asm/hw_irq.h
index 749d042..749d042 100644
--- a/include/asm-x86/hw_irq.h
+++ b/arch/x86/include/asm/hw_irq.h
diff --git a/include/asm-x86/hypertransport.h b/arch/x86/include/asm/hypertransport.h
index cc011a3..cc011a3 100644
--- a/include/asm-x86/hypertransport.h
+++ b/arch/x86/include/asm/hypertransport.h
diff --git a/include/asm-x86/i387.h b/arch/x86/include/asm/i387.h
index 9ba862a..9ba862a 100644
--- a/include/asm-x86/i387.h
+++ b/arch/x86/include/asm/i387.h
diff --git a/include/asm-x86/i8253.h b/arch/x86/include/asm/i8253.h
index 15a5b53..15a5b53 100644
--- a/include/asm-x86/i8253.h
+++ b/arch/x86/include/asm/i8253.h
diff --git a/include/asm-x86/i8259.h b/arch/x86/include/asm/i8259.h
index 23c1b3b..23c1b3b 100644
--- a/include/asm-x86/i8259.h
+++ b/arch/x86/include/asm/i8259.h
diff --git a/include/asm-x86/ia32.h b/arch/x86/include/asm/ia32.h
index f932f7a..f932f7a 100644
--- a/include/asm-x86/ia32.h
+++ b/arch/x86/include/asm/ia32.h
diff --git a/include/asm-x86/ia32_unistd.h b/arch/x86/include/asm/ia32_unistd.h
index dbd887d..dbd887d 100644
--- a/include/asm-x86/ia32_unistd.h
+++ b/arch/x86/include/asm/ia32_unistd.h
diff --git a/include/asm-x86/idle.h b/arch/x86/include/asm/idle.h
index baa3f783..baa3f783 100644
--- a/include/asm-x86/idle.h
+++ b/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
index 07c03c6..07c03c6 100644
--- a/include/asm-x86/intel_arch_perfmon.h
+++ b/arch/x86/include/asm/intel_arch_perfmon.h
diff --git a/include/asm-x86/io.h b/arch/x86/include/asm/io.h
index a233f83..a233f83 100644
--- a/include/asm-x86/io.h
+++ b/arch/x86/include/asm/io.h
diff --git a/include/asm-x86/io_32.h b/arch/x86/include/asm/io_32.h
index 4f7d878..4f7d878 100644
--- a/include/asm-x86/io_32.h
+++ b/arch/x86/include/asm/io_32.h
diff --git a/include/asm-x86/io_64.h b/arch/x86/include/asm/io_64.h
index ee6e086..ee6e086 100644
--- a/include/asm-x86/io_64.h
+++ b/arch/x86/include/asm/io_64.h
diff --git a/include/asm-x86/io_apic.h b/arch/x86/include/asm/io_apic.h
index d35cbd7..d35cbd7 100644
--- a/include/asm-x86/io_apic.h
+++ b/arch/x86/include/asm/io_apic.h
diff --git a/include/asm-x86/ioctl.h b/arch/x86/include/asm/ioctl.h
index b279fe0..b279fe0 100644
--- a/include/asm-x86/ioctl.h
+++ b/arch/x86/include/asm/ioctl.h
diff --git a/include/asm-x86/ioctls.h b/arch/x86/include/asm/ioctls.h
index 06752a6..06752a6 100644
--- a/include/asm-x86/ioctls.h
+++ b/arch/x86/include/asm/ioctls.h
diff --git a/include/asm-x86/iommu.h b/arch/x86/include/asm/iommu.h
index 961e746..961e746 100644
--- a/include/asm-x86/iommu.h
+++ b/arch/x86/include/asm/iommu.h
diff --git a/include/asm-x86/ipcbuf.h b/arch/x86/include/asm/ipcbuf.h
index 910304f..910304f 100644
--- a/include/asm-x86/ipcbuf.h
+++ b/arch/x86/include/asm/ipcbuf.h
diff --git a/include/asm-x86/ipi.h b/arch/x86/include/asm/ipi.h
index 30a692c..30a692c 100644
--- a/include/asm-x86/ipi.h
+++ b/arch/x86/include/asm/ipi.h
diff --git a/include/asm-x86/irq.h b/arch/x86/include/asm/irq.h
index 1e5f290..1e5f290 100644
--- a/include/asm-x86/irq.h
+++ b/arch/x86/include/asm/irq.h
diff --git a/include/asm-x86/irq_regs.h b/arch/x86/include/asm/irq_regs.h
index 89c898a..89c898a 100644
--- a/include/asm-x86/irq_regs.h
+++ b/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
index 316a3b2..316a3b2 100644
--- a/include/asm-x86/irq_regs_32.h
+++ b/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
index 3dd9c0b..3dd9c0b 100644
--- a/include/asm-x86/irq_regs_64.h
+++ b/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
index 78242c6..78242c6 100644
--- a/include/asm-x86/irq_remapping.h
+++ b/arch/x86/include/asm/irq_remapping.h
diff --git a/include/asm-x86/irq_vectors.h b/arch/x86/include/asm/irq_vectors.h
index a8d065d..a8d065d 100644
--- a/include/asm-x86/irq_vectors.h
+++ b/arch/x86/include/asm/irq_vectors.h
diff --git a/include/asm-x86/irqflags.h b/arch/x86/include/asm/irqflags.h
index 2bdab21..2bdab21 100644
--- a/include/asm-x86/irqflags.h
+++ b/arch/x86/include/asm/irqflags.h
diff --git a/include/asm-x86/ist.h b/arch/x86/include/asm/ist.h
index 35a2fe9..35a2fe9 100644
--- a/include/asm-x86/ist.h
+++ b/arch/x86/include/asm/ist.h
diff --git a/include/asm-x86/k8.h b/arch/x86/include/asm/k8.h
index 2bbaf43..2bbaf43 100644
--- a/include/asm-x86/k8.h
+++ b/arch/x86/include/asm/k8.h
diff --git a/include/asm-x86/kdebug.h b/arch/x86/include/asm/kdebug.h
index fbbab66..fbbab66 100644
--- a/include/asm-x86/kdebug.h
+++ b/arch/x86/include/asm/kdebug.h
diff --git a/include/asm-x86/kexec.h b/arch/x86/include/asm/kexec.h
index ea09600..ea09600 100644
--- a/include/asm-x86/kexec.h
+++ b/arch/x86/include/asm/kexec.h
diff --git a/include/asm-x86/kgdb.h b/arch/x86/include/asm/kgdb.h
index d283863..d283863 100644
--- a/include/asm-x86/kgdb.h
+++ b/arch/x86/include/asm/kgdb.h
diff --git a/include/asm-x86/kmap_types.h b/arch/x86/include/asm/kmap_types.h
index 89f4449..89f4449 100644
--- a/include/asm-x86/kmap_types.h
+++ b/arch/x86/include/asm/kmap_types.h
diff --git a/include/asm-x86/kprobes.h b/arch/x86/include/asm/kprobes.h
index 8a0748d..8a0748d 100644
--- a/include/asm-x86/kprobes.h
+++ b/arch/x86/include/asm/kprobes.h
diff --git a/include/asm-x86/kvm.h b/arch/x86/include/asm/kvm.h
index ba0dd79..ba0dd79 100644
--- a/include/asm-x86/kvm.h
+++ b/arch/x86/include/asm/kvm.h
diff --git a/include/asm-x86/kvm_host.h b/arch/x86/include/asm/kvm_host.h
index 411fb8c..411fb8c 100644
--- a/include/asm-x86/kvm_host.h
+++ b/arch/x86/include/asm/kvm_host.h
diff --git a/include/asm-x86/kvm_para.h b/arch/x86/include/asm/kvm_para.h
index 30054fd..30054fd 100644
--- a/include/asm-x86/kvm_para.h
+++ b/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
index e2d9b03..e2d9b03 100644
--- a/include/asm-x86/kvm_x86_emulate.h
+++ b/arch/x86/include/asm/kvm_x86_emulate.h
diff --git a/include/asm-x86/ldt.h b/arch/x86/include/asm/ldt.h
index a522850..a522850 100644
--- a/include/asm-x86/ldt.h
+++ b/arch/x86/include/asm/ldt.h
diff --git a/include/asm-x86/lguest.h b/arch/x86/include/asm/lguest.h
index 7505e94..7505e94 100644
--- a/include/asm-x86/lguest.h
+++ b/arch/x86/include/asm/lguest.h
diff --git a/include/asm-x86/lguest_hcall.h b/arch/x86/include/asm/lguest_hcall.h
index 8f034ba..8f034ba 100644
--- a/include/asm-x86/lguest_hcall.h
+++ b/arch/x86/include/asm/lguest_hcall.h
diff --git a/include/asm-x86/linkage.h b/arch/x86/include/asm/linkage.h
index 42d8b62..42d8b62 100644
--- a/include/asm-x86/linkage.h
+++ b/arch/x86/include/asm/linkage.h
diff --git a/include/asm-x86/local.h b/arch/x86/include/asm/local.h
index ae91994..ae91994 100644
--- a/include/asm-x86/local.h
+++ b/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
index 2aa61b5..2aa61b5 100644
--- a/include/asm-x86/mach-default/apm.h
+++ b/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
index 23ecda0..23ecda0 100644
--- a/include/asm-x86/mach-default/do_timer.h
+++ b/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
index 6b1add8..6b1add8 100644
--- a/include/asm-x86/mach-default/entry_arch.h
+++ b/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
index 3c66f2c..3c66f2c 100644
--- a/include/asm-x86/mach-default/mach_apic.h
+++ b/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
index 0c2d41c..0c2d41c 100644
--- a/include/asm-x86/mach-default/mach_apicdef.h
+++ b/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
index 674bc7e..674bc7e 100644
--- a/include/asm-x86/mach-default/mach_ipi.h
+++ b/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
index 9c381f2..9c381f2 100644
--- a/include/asm-x86/mach-default/mach_mpparse.h
+++ b/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
index d77646f..d77646f 100644
--- a/include/asm-x86/mach-default/mach_mpspec.h
+++ b/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
index 990b158..990b158 100644
--- a/include/asm-x86/mach-default/mach_timer.h
+++ b/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
index ff8778f..ff8778f 100644
--- a/include/asm-x86/mach-default/mach_traps.h
+++ b/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
index 361b810..361b810 100644
--- a/include/asm-x86/mach-default/mach_wakecpu.h
+++ b/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
index ed0bab4..ed0bab4 100644
--- a/include/asm-x86/mach-default/pci-functions.h
+++ b/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
index 3884620..3884620 100644
--- a/include/asm-x86/mach-default/setup_arch.h
+++ b/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
index dbab36d..dbab36d 100644
--- a/include/asm-x86/mach-default/smpboot_hooks.h
+++ b/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
index 6ce0f77..6ce0f77 100644
--- a/include/asm-x86/mach-generic/gpio.h
+++ b/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
index 5085b52..5085b52 100644
--- a/include/asm-x86/mach-generic/mach_apic.h
+++ b/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
index 1657f38..1657f38 100644
--- a/include/asm-x86/mach-generic/mach_apicdef.h
+++ b/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
index f67433d..f67433d 100644
--- a/include/asm-x86/mach-generic/mach_ipi.h
+++ b/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
index 3115564..3115564 100644
--- a/include/asm-x86/mach-generic/mach_mpparse.h
+++ b/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
index 6061b15..6061b15 100644
--- a/include/asm-x86/mach-generic/mach_mpspec.h
+++ b/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
index 94b6cdf..94b6cdf 100644
--- a/include/asm-x86/mach-rdc321x/gpio.h
+++ b/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
index c8e9c8b..c8e9c8b 100644
--- a/include/asm-x86/mach-rdc321x/rdc321x_defs.h
+++ b/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
index 9e5a459..9e5a459 100644
--- a/include/asm-x86/mach-voyager/do_timer.h
+++ b/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
index ae52624..ae52624 100644
--- a/include/asm-x86/mach-voyager/entry_arch.h
+++ b/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
index 71729ca..71729ca 100644
--- a/include/asm-x86/mach-voyager/setup_arch.h
+++ b/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
index 5768d8e..5768d8e 100644
--- a/include/asm-x86/math_emu.h
+++ b/arch/x86/include/asm/math_emu.h
diff --git a/include/asm-x86/mc146818rtc.h b/arch/x86/include/asm/mc146818rtc.h
index a995f33..a995f33 100644
--- a/include/asm-x86/mc146818rtc.h
+++ b/arch/x86/include/asm/mc146818rtc.h
diff --git a/include/asm-x86/mca.h b/arch/x86/include/asm/mca.h
index 60d1ed2..60d1ed2 100644
--- a/include/asm-x86/mca.h
+++ b/arch/x86/include/asm/mca.h
diff --git a/include/asm-x86/mca_dma.h b/arch/x86/include/asm/mca_dma.h
index 49f22be..49f22be 100644
--- a/include/asm-x86/mca_dma.h
+++ b/arch/x86/include/asm/mca_dma.h
diff --git a/include/asm-x86/mce.h b/arch/x86/include/asm/mce.h
index 036133e..036133e 100644
--- a/include/asm-x86/mce.h
+++ b/arch/x86/include/asm/mce.h
diff --git a/include/asm-x86/microcode.h b/arch/x86/include/asm/microcode.h
index 62c793b..62c793b 100644
--- a/include/asm-x86/microcode.h
+++ b/arch/x86/include/asm/microcode.h
diff --git a/include/asm-x86/mman.h b/arch/x86/include/asm/mman.h
index 4ef28e6..4ef28e6 100644
--- a/include/asm-x86/mman.h
+++ b/arch/x86/include/asm/mman.h
diff --git a/include/asm-x86/mmconfig.h b/arch/x86/include/asm/mmconfig.h
index fb79b1c..fb79b1c 100644
--- a/include/asm-x86/mmconfig.h
+++ b/arch/x86/include/asm/mmconfig.h
diff --git a/include/asm-x86/mmu.h b/arch/x86/include/asm/mmu.h
index 9d5aff1..9d5aff1 100644
--- a/include/asm-x86/mmu.h
+++ b/arch/x86/include/asm/mmu.h
diff --git a/include/asm-x86/mmu_context.h b/arch/x86/include/asm/mmu_context.h
index 8ec940b..8ec940b 100644
--- a/include/asm-x86/mmu_context.h
+++ b/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
index cce6f6e..cce6f6e 100644
--- a/include/asm-x86/mmu_context_32.h
+++ b/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
index 2675867..2675867 100644
--- a/include/asm-x86/mmu_context_64.h
+++ b/arch/x86/include/asm/mmu_context_64.h
diff --git a/include/asm-x86/mmx.h b/arch/x86/include/asm/mmx.h
index 2e7299b..2e7299b 100644
--- a/include/asm-x86/mmx.h
+++ b/arch/x86/include/asm/mmx.h
diff --git a/include/asm-x86/mmzone.h b/arch/x86/include/asm/mmzone.h
index 64217ea..64217ea 100644
--- a/include/asm-x86/mmzone.h
+++ b/arch/x86/include/asm/mmzone.h
diff --git a/include/asm-x86/mmzone_32.h b/arch/x86/include/asm/mmzone_32.h
index 121b65d..121b65d 100644
--- a/include/asm-x86/mmzone_32.h
+++ b/arch/x86/include/asm/mmzone_32.h
diff --git a/include/asm-x86/mmzone_64.h b/arch/x86/include/asm/mmzone_64.h
index 6480f33..6480f33 100644
--- a/include/asm-x86/mmzone_64.h
+++ b/arch/x86/include/asm/mmzone_64.h
diff --git a/include/asm-x86/module.h b/arch/x86/include/asm/module.h
index 864f200..864f200 100644
--- a/include/asm-x86/module.h
+++ b/arch/x86/include/asm/module.h
diff --git a/include/asm-x86/mpspec.h b/arch/x86/include/asm/mpspec.h
index be2241a..be2241a 100644
--- a/include/asm-x86/mpspec.h
+++ b/arch/x86/include/asm/mpspec.h
diff --git a/include/asm-x86/mpspec_def.h b/arch/x86/include/asm/mpspec_def.h
index 79166b0..79166b0 100644
--- a/include/asm-x86/mpspec_def.h
+++ b/arch/x86/include/asm/mpspec_def.h
diff --git a/include/asm-x86/msgbuf.h b/arch/x86/include/asm/msgbuf.h
index 1b538c9..1b538c9 100644
--- a/include/asm-x86/msgbuf.h
+++ b/arch/x86/include/asm/msgbuf.h
diff --git a/include/asm-x86/msidef.h b/arch/x86/include/asm/msidef.h
index ed91902..ed91902 100644
--- a/include/asm-x86/msidef.h
+++ b/arch/x86/include/asm/msidef.h
diff --git a/include/asm-x86/msr-index.h b/arch/x86/include/asm/msr-index.h
index dabd10f..dabd10f 100644
--- a/include/asm-x86/msr-index.h
+++ b/arch/x86/include/asm/msr-index.h
diff --git a/include/asm-x86/msr.h b/arch/x86/include/asm/msr.h
index 530af1f..530af1f 100644
--- a/include/asm-x86/msr.h
+++ b/arch/x86/include/asm/msr.h
diff --git a/include/asm-x86/mtrr.h b/arch/x86/include/asm/mtrr.h
index 23a7f83..23a7f83 100644
--- a/include/asm-x86/mtrr.h
+++ b/arch/x86/include/asm/mtrr.h
diff --git a/include/asm-x86/mutex.h b/arch/x86/include/asm/mutex.h
index a731b9c..a731b9c 100644
--- a/include/asm-x86/mutex.h
+++ b/arch/x86/include/asm/mutex.h
diff --git a/include/asm-x86/mutex_32.h b/arch/x86/include/asm/mutex_32.h
index 25c16d8..25c16d8 100644
--- a/include/asm-x86/mutex_32.h
+++ b/arch/x86/include/asm/mutex_32.h
diff --git a/include/asm-x86/mutex_64.h b/arch/x86/include/asm/mutex_64.h
index 918ba21..918ba21 100644
--- a/include/asm-x86/mutex_64.h
+++ b/arch/x86/include/asm/mutex_64.h
diff --git a/include/asm-x86/nmi.h b/arch/x86/include/asm/nmi.h
index a53f829..a53f829 100644
--- a/include/asm-x86/nmi.h
+++ b/arch/x86/include/asm/nmi.h
diff --git a/include/asm-x86/nops.h b/arch/x86/include/asm/nops.h
index ae74272..ae74272 100644
--- a/include/asm-x86/nops.h
+++ b/arch/x86/include/asm/nops.h
diff --git a/include/asm-x86/numa.h b/arch/x86/include/asm/numa.h
index 27da400..27da400 100644
--- a/include/asm-x86/numa.h
+++ b/arch/x86/include/asm/numa.h
diff --git a/include/asm-x86/numa_32.h b/arch/x86/include/asm/numa_32.h
index 44cb078..44cb078 100644
--- a/include/asm-x86/numa_32.h
+++ b/arch/x86/include/asm/numa_32.h
diff --git a/include/asm-x86/numa_64.h b/arch/x86/include/asm/numa_64.h
index 15c9903..15c9903 100644
--- a/include/asm-x86/numa_64.h
+++ b/arch/x86/include/asm/numa_64.h
diff --git a/include/asm-x86/numaq.h b/arch/x86/include/asm/numaq.h
index 124bf7d..124bf7d 100644
--- a/include/asm-x86/numaq.h
+++ b/arch/x86/include/asm/numaq.h
diff --git a/include/asm-x86/numaq/apic.h b/arch/x86/include/asm/numaq/apic.h
index 0bf2a06..0bf2a06 100644
--- a/include/asm-x86/numaq/apic.h
+++ b/arch/x86/include/asm/numaq/apic.h
diff --git a/include/asm-x86/numaq/apicdef.h b/arch/x86/include/asm/numaq/apicdef.h
index e012a46..e012a46 100644
--- a/include/asm-x86/numaq/apicdef.h
+++ b/arch/x86/include/asm/numaq/apicdef.h
diff --git a/include/asm-x86/numaq/ipi.h b/arch/x86/include/asm/numaq/ipi.h
index 935588d2..935588d2 100644
--- a/include/asm-x86/numaq/ipi.h
+++ b/arch/x86/include/asm/numaq/ipi.h
diff --git a/include/asm-x86/numaq/mpparse.h b/arch/x86/include/asm/numaq/mpparse.h
index 252292e..252292e 100644
--- a/include/asm-x86/numaq/mpparse.h
+++ b/arch/x86/include/asm/numaq/mpparse.h
diff --git a/include/asm-x86/numaq/wakecpu.h b/arch/x86/include/asm/numaq/wakecpu.h
index c577bda..c577bda 100644
--- a/include/asm-x86/numaq/wakecpu.h
+++ b/arch/x86/include/asm/numaq/wakecpu.h
diff --git a/include/asm-x86/olpc.h b/arch/x86/include/asm/olpc.h
index d7328b1..d7328b1 100644
--- a/include/asm-x86/olpc.h
+++ b/arch/x86/include/asm/olpc.h
diff --git a/include/asm-x86/page.h b/arch/x86/include/asm/page.h
index d4f1d57..d4f1d57 100644
--- a/include/asm-x86/page.h
+++ b/arch/x86/include/asm/page.h
diff --git a/include/asm-x86/page_32.h b/arch/x86/include/asm/page_32.h
index bdf5dba..bdf5dba 100644
--- a/include/asm-x86/page_32.h
+++ b/arch/x86/include/asm/page_32.h
diff --git a/include/asm-x86/page_64.h b/arch/x86/include/asm/page_64.h
index 49380b8..49380b8 100644
--- a/include/asm-x86/page_64.h
+++ b/arch/x86/include/asm/page_64.h
diff --git a/include/asm-x86/param.h b/arch/x86/include/asm/param.h
index 0009cfb..0009cfb 100644
--- a/include/asm-x86/param.h
+++ b/arch/x86/include/asm/param.h
diff --git a/include/asm-x86/paravirt.h b/arch/x86/include/asm/paravirt.h
index 8d6ae2f..8d6ae2f 100644
--- a/include/asm-x86/paravirt.h
+++ b/arch/x86/include/asm/paravirt.h
diff --git a/include/asm-x86/parport.h b/arch/x86/include/asm/parport.h
index 2e3dda4..2e3dda4 100644
--- a/include/asm-x86/parport.h
+++ b/arch/x86/include/asm/parport.h
diff --git a/include/asm-x86/pat.h b/arch/x86/include/asm/pat.h
index 482c3e3..482c3e3 100644
--- a/include/asm-x86/pat.h
+++ b/arch/x86/include/asm/pat.h
diff --git a/include/asm-x86/pci-direct.h b/arch/x86/include/asm/pci-direct.h
index da42be0..da42be0 100644
--- a/include/asm-x86/pci-direct.h
+++ b/arch/x86/include/asm/pci-direct.h
diff --git a/include/asm-x86/pci.h b/arch/x86/include/asm/pci.h
index 6025831..6025831 100644
--- a/include/asm-x86/pci.h
+++ b/arch/x86/include/asm/pci.h
diff --git a/include/asm-x86/pci_32.h b/arch/x86/include/asm/pci_32.h
index 3f22882..3f22882 100644
--- a/include/asm-x86/pci_32.h
+++ b/arch/x86/include/asm/pci_32.h
diff --git a/include/asm-x86/pci_64.h b/arch/x86/include/asm/pci_64.h
index f72e12d..f72e12d 100644
--- a/include/asm-x86/pci_64.h
+++ b/arch/x86/include/asm/pci_64.h
diff --git a/include/asm-x86/pda.h b/arch/x86/include/asm/pda.h
index 80860af..80860af 100644
--- a/include/asm-x86/pda.h
+++ b/arch/x86/include/asm/pda.h
diff --git a/include/asm-x86/percpu.h b/arch/x86/include/asm/percpu.h
index e10a1d0..e10a1d0 100644
--- a/include/asm-x86/percpu.h
+++ b/arch/x86/include/asm/percpu.h
diff --git a/include/asm-x86/pgalloc.h b/arch/x86/include/asm/pgalloc.h
index 3cd23ad..3cd23ad 100644
--- a/include/asm-x86/pgalloc.h
+++ b/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
index 7ec48f4..7ec48f4 100644
--- a/include/asm-x86/pgtable-2level-defs.h
+++ b/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
index 8176208..8176208 100644
--- a/include/asm-x86/pgtable-2level.h
+++ b/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
index c05fe6f..c05fe6f 100644
--- a/include/asm-x86/pgtable-3level-defs.h
+++ b/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
index 75f4276..75f4276 100644
--- a/include/asm-x86/pgtable-3level.h
+++ b/arch/x86/include/asm/pgtable-3level.h
diff --git a/include/asm-x86/pgtable.h b/arch/x86/include/asm/pgtable.h
index 88a53b1..88a53b1 100644
--- a/include/asm-x86/pgtable.h
+++ b/arch/x86/include/asm/pgtable.h
diff --git a/include/asm-x86/pgtable_32.h b/arch/x86/include/asm/pgtable_32.h
index 8de702d..8de702d 100644
--- a/include/asm-x86/pgtable_32.h
+++ b/arch/x86/include/asm/pgtable_32.h
diff --git a/include/asm-x86/pgtable_64.h b/arch/x86/include/asm/pgtable_64.h
index fde9770..fde9770 100644
--- a/include/asm-x86/pgtable_64.h
+++ b/arch/x86/include/asm/pgtable_64.h
diff --git a/include/asm-x86/poll.h b/arch/x86/include/asm/poll.h
index c98509d..c98509d 100644
--- a/include/asm-x86/poll.h
+++ b/arch/x86/include/asm/poll.h
diff --git a/include/asm-x86/posix_types.h b/arch/x86/include/asm/posix_types.h
index bb7133d..bb7133d 100644
--- a/include/asm-x86/posix_types.h
+++ b/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
index 70cf2bb..70cf2bb 100644
--- a/include/asm-x86/posix_types_32.h
+++ b/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
index 388b4e7..388b4e7 100644
--- a/include/asm-x86/posix_types_64.h
+++ b/arch/x86/include/asm/posix_types_64.h
diff --git a/include/asm-x86/prctl.h b/arch/x86/include/asm/prctl.h
index e7ae34e..e7ae34e 100644
--- a/include/asm-x86/prctl.h
+++ b/arch/x86/include/asm/prctl.h
diff --git a/include/asm-x86/processor-cyrix.h b/arch/x86/include/asm/processor-cyrix.h
index 1198f2a..1198f2a 100644
--- a/include/asm-x86/processor-cyrix.h
+++ b/arch/x86/include/asm/processor-cyrix.h
diff --git a/include/asm-x86/processor-flags.h b/arch/x86/include/asm/processor-flags.h
index dc5f071..dc5f071 100644
--- a/include/asm-x86/processor-flags.h
+++ b/arch/x86/include/asm/processor-flags.h
diff --git a/include/asm-x86/processor.h b/arch/x86/include/asm/processor.h
index ee7cbb3..ee7cbb3 100644
--- a/include/asm-x86/processor.h
+++ b/arch/x86/include/asm/processor.h
diff --git a/include/asm-x86/proto.h b/arch/x86/include/asm/proto.h
index 6e89e8b..6e89e8b 100644
--- a/include/asm-x86/proto.h
+++ b/arch/x86/include/asm/proto.h
diff --git a/include/asm-x86/ptrace-abi.h b/arch/x86/include/asm/ptrace-abi.h
index 4298b88..4298b88 100644
--- a/include/asm-x86/ptrace-abi.h
+++ b/arch/x86/include/asm/ptrace-abi.h
diff --git a/include/asm-x86/ptrace.h b/arch/x86/include/asm/ptrace.h
index a202552..a202552 100644
--- a/include/asm-x86/ptrace.h
+++ b/arch/x86/include/asm/ptrace.h
diff --git a/include/asm-x86/pvclock-abi.h b/arch/x86/include/asm/pvclock-abi.h
index edb3b4e..edb3b4e 100644
--- a/include/asm-x86/pvclock-abi.h
+++ b/arch/x86/include/asm/pvclock-abi.h
diff --git a/include/asm-x86/pvclock.h b/arch/x86/include/asm/pvclock.h
index ad29e27..ad29e27 100644
--- a/include/asm-x86/pvclock.h
+++ b/arch/x86/include/asm/pvclock.h
diff --git a/include/asm-x86/reboot.h b/arch/x86/include/asm/reboot.h
index 1c2f0ce..1c2f0ce 100644
--- a/include/asm-x86/reboot.h
+++ b/arch/x86/include/asm/reboot.h
diff --git a/include/asm-x86/reboot_fixups.h b/arch/x86/include/asm/reboot_fixups.h
index 2c2987d..2c2987d 100644
--- a/include/asm-x86/reboot_fixups.h
+++ b/arch/x86/include/asm/reboot_fixups.h
diff --git a/include/asm-x86/required-features.h b/arch/x86/include/asm/required-features.h
index a01c4e37..a01c4e37 100644
--- a/include/asm-x86/required-features.h
+++ b/arch/x86/include/asm/required-features.h
diff --git a/include/asm-x86/resource.h b/arch/x86/include/asm/resource.h
index 04bc4db..04bc4db 100644
--- a/include/asm-x86/resource.h
+++ b/arch/x86/include/asm/resource.h
diff --git a/include/asm-x86/resume-trace.h b/arch/x86/include/asm/resume-trace.h
index e39376d..e39376d 100644
--- a/include/asm-x86/resume-trace.h
+++ b/arch/x86/include/asm/resume-trace.h
diff --git a/include/asm-x86/rio.h b/arch/x86/include/asm/rio.h
index 5e1256b..5e1256b 100644
--- a/include/asm-x86/rio.h
+++ b/arch/x86/include/asm/rio.h
diff --git a/include/asm-x86/rtc.h b/arch/x86/include/asm/rtc.h
index f71c3b0..f71c3b0 100644
--- a/include/asm-x86/rtc.h
+++ b/arch/x86/include/asm/rtc.h
diff --git a/include/asm-x86/rwlock.h b/arch/x86/include/asm/rwlock.h
index 48a3109..48a3109 100644
--- a/include/asm-x86/rwlock.h
+++ b/arch/x86/include/asm/rwlock.h
diff --git a/include/asm-x86/rwsem.h b/arch/x86/include/asm/rwsem.h
index 3ff3015..3ff3015 100644
--- a/include/asm-x86/rwsem.h
+++ b/arch/x86/include/asm/rwsem.h
diff --git a/include/asm-x86/scatterlist.h b/arch/x86/include/asm/scatterlist.h
index ee48f88..ee48f88 100644
--- a/include/asm-x86/scatterlist.h
+++ b/arch/x86/include/asm/scatterlist.h
diff --git a/include/asm-x86/seccomp.h b/arch/x86/include/asm/seccomp.h
index c62e58a..c62e58a 100644
--- a/include/asm-x86/seccomp.h
+++ b/arch/x86/include/asm/seccomp.h
diff --git a/include/asm-x86/seccomp_32.h b/arch/x86/include/asm/seccomp_32.h
index cf9ab2d..cf9ab2d 100644
--- a/include/asm-x86/seccomp_32.h
+++ b/arch/x86/include/asm/seccomp_32.h
diff --git a/include/asm-x86/seccomp_64.h b/arch/x86/include/asm/seccomp_64.h
index 03274ce..03274ce 100644
--- a/include/asm-x86/seccomp_64.h
+++ b/arch/x86/include/asm/seccomp_64.h
diff --git a/include/asm-x86/sections.h b/arch/x86/include/asm/sections.h
index 2b8c516..2b8c516 100644
--- a/include/asm-x86/sections.h
+++ b/arch/x86/include/asm/sections.h
diff --git a/include/asm-x86/segment.h b/arch/x86/include/asm/segment.h
index 5d6e694..5d6e694 100644
--- a/include/asm-x86/segment.h
+++ b/arch/x86/include/asm/segment.h
diff --git a/include/asm-x86/sembuf.h b/arch/x86/include/asm/sembuf.h
index 81f06b7..81f06b7 100644
--- a/include/asm-x86/sembuf.h
+++ b/arch/x86/include/asm/sembuf.h
diff --git a/include/asm-x86/serial.h b/arch/x86/include/asm/serial.h
index 303660b..303660b 100644
--- a/include/asm-x86/serial.h
+++ b/arch/x86/include/asm/serial.h
diff --git a/include/asm-x86/setup.h b/arch/x86/include/asm/setup.h
index 11b6cc1..11b6cc1 100644
--- a/include/asm-x86/setup.h
+++ b/arch/x86/include/asm/setup.h
diff --git a/include/asm-x86/shmbuf.h b/arch/x86/include/asm/shmbuf.h
index f51aec2..f51aec2 100644
--- a/include/asm-x86/shmbuf.h
+++ b/arch/x86/include/asm/shmbuf.h
diff --git a/include/asm-x86/shmparam.h b/arch/x86/include/asm/shmparam.h
index a83a1fd..a83a1fd 100644
--- a/include/asm-x86/shmparam.h
+++ b/arch/x86/include/asm/shmparam.h
diff --git a/include/asm-x86/sigcontext.h b/arch/x86/include/asm/sigcontext.h
index ee813f4..ee813f4 100644
--- a/include/asm-x86/sigcontext.h
+++ b/arch/x86/include/asm/sigcontext.h
diff --git a/include/asm-x86/sigcontext32.h b/arch/x86/include/asm/sigcontext32.h
index 8c34703..8c34703 100644
--- a/include/asm-x86/sigcontext32.h
+++ b/arch/x86/include/asm/sigcontext32.h
diff --git a/include/asm-x86/siginfo.h b/arch/x86/include/asm/siginfo.h
index 808bdfb..808bdfb 100644
--- a/include/asm-x86/siginfo.h
+++ b/arch/x86/include/asm/siginfo.h
diff --git a/include/asm-x86/signal.h b/arch/x86/include/asm/signal.h
index 65acc82..65acc82 100644
--- a/include/asm-x86/signal.h
+++ b/arch/x86/include/asm/signal.h
diff --git a/include/asm-x86/smp.h b/arch/x86/include/asm/smp.h
index a6afc29..a6afc29 100644
--- a/include/asm-x86/smp.h
+++ b/arch/x86/include/asm/smp.h
diff --git a/include/asm-x86/socket.h b/arch/x86/include/asm/socket.h
index db73274..db73274 100644
--- a/include/asm-x86/socket.h
+++ b/arch/x86/include/asm/socket.h
diff --git a/include/asm-x86/sockios.h b/arch/x86/include/asm/sockios.h
index a006704..a006704 100644
--- a/include/asm-x86/sockios.h
+++ b/arch/x86/include/asm/sockios.h
diff --git a/include/asm-x86/sparsemem.h b/arch/x86/include/asm/sparsemem.h
index 38f8e6b..38f8e6b 100644
--- a/include/asm-x86/sparsemem.h
+++ b/arch/x86/include/asm/sparsemem.h
diff --git a/include/asm-x86/spinlock.h b/arch/x86/include/asm/spinlock.h
index 157ff7f..157ff7f 100644
--- a/include/asm-x86/spinlock.h
+++ b/arch/x86/include/asm/spinlock.h
diff --git a/include/asm-x86/spinlock_types.h b/arch/x86/include/asm/spinlock_types.h
index 6aa9b56..6aa9b56 100644
--- a/include/asm-x86/spinlock_types.h
+++ b/arch/x86/include/asm/spinlock_types.h
diff --git a/include/asm-x86/srat.h b/arch/x86/include/asm/srat.h
index 5363e4f..5363e4f 100644
--- a/include/asm-x86/srat.h
+++ b/arch/x86/include/asm/srat.h
diff --git a/include/asm-x86/stacktrace.h b/arch/x86/include/asm/stacktrace.h
index f43517e..f43517e 100644
--- a/include/asm-x86/stacktrace.h
+++ b/arch/x86/include/asm/stacktrace.h
diff --git a/include/asm-x86/stat.h b/arch/x86/include/asm/stat.h
index 1e120f6..1e120f6 100644
--- a/include/asm-x86/stat.h
+++ b/arch/x86/include/asm/stat.h
diff --git a/include/asm-x86/statfs.h b/arch/x86/include/asm/statfs.h
index ca5dc19..ca5dc19 100644
--- a/include/asm-x86/statfs.h
+++ b/arch/x86/include/asm/statfs.h
diff --git a/include/asm-x86/string.h b/arch/x86/include/asm/string.h
index 6dfd6d9..6dfd6d9 100644
--- a/include/asm-x86/string.h
+++ b/arch/x86/include/asm/string.h
diff --git a/include/asm-x86/string_32.h b/arch/x86/include/asm/string_32.h
index 487843e..487843e 100644
--- a/include/asm-x86/string_32.h
+++ b/arch/x86/include/asm/string_32.h
diff --git a/include/asm-x86/string_64.h b/arch/x86/include/asm/string_64.h
index a2add11d..a2add11d 100644
--- a/include/asm-x86/string_64.h
+++ b/arch/x86/include/asm/string_64.h
diff --git a/include/asm-x86/summit/apic.h b/arch/x86/include/asm/summit/apic.h
index 9b3070f..9b3070f 100644
--- a/include/asm-x86/summit/apic.h
+++ b/arch/x86/include/asm/summit/apic.h
diff --git a/include/asm-x86/summit/apicdef.h b/arch/x86/include/asm/summit/apicdef.h
index f3fbca1..f3fbca1 100644
--- a/include/asm-x86/summit/apicdef.h
+++ b/arch/x86/include/asm/summit/apicdef.h
diff --git a/include/asm-x86/summit/ipi.h b/arch/x86/include/asm/summit/ipi.h
index 53bd1e7..53bd1e7 100644
--- a/include/asm-x86/summit/ipi.h
+++ b/arch/x86/include/asm/summit/ipi.h
diff --git a/include/asm-x86/summit/mpparse.h b/arch/x86/include/asm/summit/mpparse.h
index 013ce6f..013ce6f 100644
--- a/include/asm-x86/summit/mpparse.h
+++ b/arch/x86/include/asm/summit/mpparse.h
diff --git a/include/asm-x86/suspend.h b/arch/x86/include/asm/suspend.h
index 9bd521f..9bd521f 100644
--- a/include/asm-x86/suspend.h
+++ b/arch/x86/include/asm/suspend.h
diff --git a/include/asm-x86/suspend_32.h b/arch/x86/include/asm/suspend_32.h
index acb6d4d..acb6d4d 100644
--- a/include/asm-x86/suspend_32.h
+++ b/arch/x86/include/asm/suspend_32.h
diff --git a/include/asm-x86/suspend_64.h b/arch/x86/include/asm/suspend_64.h
index cf821dd..cf821dd 100644
--- a/include/asm-x86/suspend_64.h
+++ b/arch/x86/include/asm/suspend_64.h
diff --git a/include/asm-x86/swiotlb.h b/arch/x86/include/asm/swiotlb.h
index 1e20adb..1e20adb 100644
--- a/include/asm-x86/swiotlb.h
+++ b/arch/x86/include/asm/swiotlb.h
diff --git a/include/asm-x86/sync_bitops.h b/arch/x86/include/asm/sync_bitops.h
index b689bee..b689bee 100644
--- a/include/asm-x86/sync_bitops.h
+++ b/arch/x86/include/asm/sync_bitops.h
diff --git a/include/asm-x86/syscall.h b/arch/x86/include/asm/syscall.h
index 04c47dc..04c47dc 100644
--- a/include/asm-x86/syscall.h
+++ b/arch/x86/include/asm/syscall.h
diff --git a/include/asm-x86/syscalls.h b/arch/x86/include/asm/syscalls.h
index 87803da..87803da 100644
--- a/include/asm-x86/syscalls.h
+++ b/arch/x86/include/asm/syscalls.h
diff --git a/include/asm-x86/system.h b/arch/x86/include/asm/system.h
index b20c894..b20c894 100644
--- a/include/asm-x86/system.h
+++ b/arch/x86/include/asm/system.h
diff --git a/include/asm-x86/system_64.h b/arch/x86/include/asm/system_64.h
index 5aedb8b..5aedb8b 100644
--- a/include/asm-x86/system_64.h
+++ b/arch/x86/include/asm/system_64.h
diff --git a/include/asm-x86/tce.h b/arch/x86/include/asm/tce.h
index e7932d7..e7932d7 100644
--- a/include/asm-x86/tce.h
+++ b/arch/x86/include/asm/tce.h
diff --git a/include/asm-x86/termbits.h b/arch/x86/include/asm/termbits.h
index 3d00dc5..3d00dc5 100644
--- a/include/asm-x86/termbits.h
+++ b/arch/x86/include/asm/termbits.h
diff --git a/include/asm-x86/termios.h b/arch/x86/include/asm/termios.h
index e235db2..e235db2 100644
--- a/include/asm-x86/termios.h
+++ b/arch/x86/include/asm/termios.h
diff --git a/include/asm-x86/therm_throt.h b/arch/x86/include/asm/therm_throt.h
index 1c7f57b..1c7f57b 100644
--- a/include/asm-x86/therm_throt.h
+++ b/arch/x86/include/asm/therm_throt.h
diff --git a/include/asm-x86/thread_info.h b/arch/x86/include/asm/thread_info.h
index 3f4e52b..3f4e52b 100644
--- a/include/asm-x86/thread_info.h
+++ b/arch/x86/include/asm/thread_info.h
diff --git a/include/asm-x86/time.h b/arch/x86/include/asm/time.h
index 3e724ee..3e724ee 100644
--- a/include/asm-x86/time.h
+++ b/arch/x86/include/asm/time.h
diff --git a/include/asm-x86/timer.h b/arch/x86/include/asm/timer.h
index d0babce..d0babce 100644
--- a/include/asm-x86/timer.h
+++ b/arch/x86/include/asm/timer.h
diff --git a/include/asm-x86/timex.h b/arch/x86/include/asm/timex.h
index d1ce241..d1ce241 100644
--- a/include/asm-x86/timex.h
+++ b/arch/x86/include/asm/timex.h
diff --git a/include/asm-x86/tlb.h b/arch/x86/include/asm/tlb.h
index db36e9e..db36e9e 100644
--- a/include/asm-x86/tlb.h
+++ b/arch/x86/include/asm/tlb.h
diff --git a/include/asm-x86/tlbflush.h b/arch/x86/include/asm/tlbflush.h
index 3cdd08b..3cdd08b 100644
--- a/include/asm-x86/tlbflush.h
+++ b/arch/x86/include/asm/tlbflush.h
diff --git a/include/asm-x86/topology.h b/arch/x86/include/asm/topology.h
index 7eca9bc..7eca9bc 100644
--- a/include/asm-x86/topology.h
+++ b/arch/x86/include/asm/topology.h
diff --git a/include/asm-x86/trampoline.h b/arch/x86/include/asm/trampoline.h
index 0406bbd..0406bbd 100644
--- a/include/asm-x86/trampoline.h
+++ b/arch/x86/include/asm/trampoline.h
diff --git a/include/asm-x86/traps.h b/arch/x86/include/asm/traps.h
index 6c3dc2c..6c3dc2c 100644
--- a/include/asm-x86/traps.h
+++ b/arch/x86/include/asm/traps.h
diff --git a/include/asm-x86/tsc.h b/arch/x86/include/asm/tsc.h
index ad0f5c4..ad0f5c4 100644
--- a/include/asm-x86/tsc.h
+++ b/arch/x86/include/asm/tsc.h
diff --git a/include/asm-x86/types.h b/arch/x86/include/asm/types.h
index e78b52e..e78b52e 100644
--- a/include/asm-x86/types.h
+++ b/arch/x86/include/asm/types.h
diff --git a/include/asm-x86/uaccess.h b/arch/x86/include/asm/uaccess.h
index 48ebc0a..48ebc0a 100644
--- a/include/asm-x86/uaccess.h
+++ b/arch/x86/include/asm/uaccess.h
diff --git a/include/asm-x86/uaccess_32.h b/arch/x86/include/asm/uaccess_32.h
index 6b5b57d..6b5b57d 100644
--- a/include/asm-x86/uaccess_32.h
+++ b/arch/x86/include/asm/uaccess_32.h
diff --git a/include/asm-x86/uaccess_64.h b/arch/x86/include/asm/uaccess_64.h
index c96c1f5..c96c1f5 100644
--- a/include/asm-x86/uaccess_64.h
+++ b/arch/x86/include/asm/uaccess_64.h
diff --git a/include/asm-x86/ucontext.h b/arch/x86/include/asm/ucontext.h
index 89eaa54..89eaa54 100644
--- a/include/asm-x86/ucontext.h
+++ b/arch/x86/include/asm/ucontext.h
diff --git a/include/asm-x86/unaligned.h b/arch/x86/include/asm/unaligned.h
index 59dcdec..59dcdec 100644
--- a/include/asm-x86/unaligned.h
+++ b/arch/x86/include/asm/unaligned.h
diff --git a/include/asm-x86/unistd.h b/arch/x86/include/asm/unistd.h
index 2a58ed3..2a58ed3 100644
--- a/include/asm-x86/unistd.h
+++ b/arch/x86/include/asm/unistd.h
diff --git a/include/asm-x86/unistd_32.h b/arch/x86/include/asm/unistd_32.h
index 017f4a8..017f4a8 100644
--- a/include/asm-x86/unistd_32.h
+++ b/arch/x86/include/asm/unistd_32.h
diff --git a/include/asm-x86/unistd_64.h b/arch/x86/include/asm/unistd_64.h
index ace83f1..ace83f1 100644
--- a/include/asm-x86/unistd_64.h
+++ b/arch/x86/include/asm/unistd_64.h
diff --git a/include/asm-x86/unwind.h b/arch/x86/include/asm/unwind.h
index a215156..a215156 100644
--- a/include/asm-x86/unwind.h
+++ b/arch/x86/include/asm/unwind.h
diff --git a/include/asm-x86/user.h b/arch/x86/include/asm/user.h
index 999873b..999873b 100644
--- a/include/asm-x86/user.h
+++ b/arch/x86/include/asm/user.h
diff --git a/include/asm-x86/user32.h b/arch/x86/include/asm/user32.h
index aa66c18..aa66c18 100644
--- a/include/asm-x86/user32.h
+++ b/arch/x86/include/asm/user32.h
diff --git a/include/asm-x86/user_32.h b/arch/x86/include/asm/user_32.h
index e0fe2f5..e0fe2f5 100644
--- a/include/asm-x86/user_32.h
+++ b/arch/x86/include/asm/user_32.h
diff --git a/include/asm-x86/user_64.h b/arch/x86/include/asm/user_64.h
index 38b5799..38b5799 100644
--- a/include/asm-x86/user_64.h
+++ b/arch/x86/include/asm/user_64.h
diff --git a/include/asm-x86/uv/bios.h b/arch/x86/include/asm/uv/bios.h
index 215f196..215f196 100644
--- a/include/asm-x86/uv/bios.h
+++ b/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
index 77153fb..77153fb 100644
--- a/include/asm-x86/uv/uv_bau.h
+++ b/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
index bdb5b01..bdb5b01 100644
--- a/include/asm-x86/uv/uv_hub.h
+++ b/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
index 8bf5f32..8bf5f32 100644
--- a/include/asm-x86/uv/uv_irq.h
+++ b/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
index 8b03d89..8b03d89 100644
--- a/include/asm-x86/uv/uv_mmrs.h
+++ b/arch/x86/include/asm/uv/uv_mmrs.h
diff --git a/include/asm-x86/vdso.h b/arch/x86/include/asm/vdso.h
index 4ab3209..4ab3209 100644
--- a/include/asm-x86/vdso.h
+++ b/arch/x86/include/asm/vdso.h
diff --git a/include/asm-x86/vga.h b/arch/x86/include/asm/vga.h
index b9e493d..b9e493d 100644
--- a/include/asm-x86/vga.h
+++ b/arch/x86/include/asm/vga.h
diff --git a/include/asm-x86/vgtod.h b/arch/x86/include/asm/vgtod.h
index 38fd133..38fd133 100644
--- a/include/asm-x86/vgtod.h
+++ b/arch/x86/include/asm/vgtod.h
diff --git a/include/asm-x86/vic.h b/arch/x86/include/asm/vic.h
index 53100f3..53100f3 100644
--- a/include/asm-x86/vic.h
+++ b/arch/x86/include/asm/vic.h
diff --git a/include/asm-x86/visws/cobalt.h b/arch/x86/include/asm/visws/cobalt.h
index 9627a8f..9627a8f 100644
--- a/include/asm-x86/visws/cobalt.h
+++ b/arch/x86/include/asm/visws/cobalt.h
diff --git a/include/asm-x86/visws/lithium.h b/arch/x86/include/asm/visws/lithium.h
index b36d3b3..b36d3b3 100644
--- a/include/asm-x86/visws/lithium.h
+++ b/arch/x86/include/asm/visws/lithium.h
diff --git a/include/asm-x86/visws/piix4.h b/arch/x86/include/asm/visws/piix4.h
index 61c9380..61c9380 100644
--- a/include/asm-x86/visws/piix4.h
+++ b/arch/x86/include/asm/visws/piix4.h
diff --git a/include/asm-x86/visws/sgivw.h b/arch/x86/include/asm/visws/sgivw.h
index 5fbf63e..5fbf63e 100644
--- a/include/asm-x86/visws/sgivw.h
+++ b/arch/x86/include/asm/visws/sgivw.h
diff --git a/include/asm-x86/vm86.h b/arch/x86/include/asm/vm86.h
index 998bd18..998bd18 100644
--- a/include/asm-x86/vm86.h
+++ b/arch/x86/include/asm/vm86.h
diff --git a/include/asm-x86/vmi.h b/arch/x86/include/asm/vmi.h
index b7c0dea..b7c0dea 100644
--- a/include/asm-x86/vmi.h
+++ b/arch/x86/include/asm/vmi.h
diff --git a/include/asm-x86/vmi_time.h b/arch/x86/include/asm/vmi_time.h
index b2d39e6..b2d39e6 100644
--- a/include/asm-x86/vmi_time.h
+++ b/arch/x86/include/asm/vmi_time.h
diff --git a/include/asm-x86/voyager.h b/arch/x86/include/asm/voyager.h
index 9c811d2..9c811d2 100644
--- a/include/asm-x86/voyager.h
+++ b/arch/x86/include/asm/voyager.h
diff --git a/include/asm-x86/vsyscall.h b/arch/x86/include/asm/vsyscall.h
index dcd4682..dcd4682 100644
--- a/include/asm-x86/vsyscall.h
+++ b/arch/x86/include/asm/vsyscall.h
diff --git a/include/asm-x86/xcr.h b/arch/x86/include/asm/xcr.h
index f2cba4e7..f2cba4e7 100644
--- a/include/asm-x86/xcr.h
+++ b/arch/x86/include/asm/xcr.h
diff --git a/include/asm-x86/xen/events.h b/arch/x86/include/asm/xen/events.h
index 8151f5b..8151f5b 100644
--- a/include/asm-x86/xen/events.h
+++ b/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
index c4baab4..c4baab4 100644
--- a/include/asm-x86/xen/grant_table.h
+++ b/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
index 44f4259..44f4259 100644
--- a/include/asm-x86/xen/hypercall.h
+++ b/arch/x86/include/asm/xen/hypercall.h
diff --git a/include/asm-x86/xen/hypervisor.h b/arch/x86/include/asm/xen/hypervisor.h
index 445a247..445a247 100644
--- a/include/asm-x86/xen/hypervisor.h
+++ b/arch/x86/include/asm/xen/hypervisor.h
diff --git a/include/asm-x86/xen/interface.h b/arch/x86/include/asm/xen/interface.h
index d077bba..d077bba 100644
--- a/include/asm-x86/xen/interface.h
+++ b/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
index 08167e1..08167e1 100644
--- a/include/asm-x86/xen/interface_32.h
+++ b/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
index 046c0f1..046c0f1 100644
--- a/include/asm-x86/xen/interface_64.h
+++ b/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
index d5eada0..d5eada0 100644
--- a/include/asm-x86/xen/page.h
+++ b/arch/x86/include/asm/xen/page.h
diff --git a/include/asm-x86/xor.h b/arch/x86/include/asm/xor.h
index 11b3bb8..11b3bb8 100644
--- a/include/asm-x86/xor.h
+++ b/arch/x86/include/asm/xor.h
diff --git a/include/asm-x86/xor_32.h b/arch/x86/include/asm/xor_32.h
index 921b458..921b458 100644
--- a/include/asm-x86/xor_32.h
+++ b/arch/x86/include/asm/xor_32.h
diff --git a/include/asm-x86/xor_64.h b/arch/x86/include/asm/xor_64.h
index 2d3a18d..2d3a18d 100644
--- a/include/asm-x86/xor_64.h
+++ b/arch/x86/include/asm/xor_64.h
diff --git a/include/asm-x86/xsave.h b/arch/x86/include/asm/xsave.h
index 08e9a1a..08e9a1a 100644
--- a/include/asm-x86/xsave.h
+++ b/arch/x86/include/asm/xsave.h
diff --git a/arch/x86/kernel/cpu/Makefile b/arch/x86/kernel/cpu/Makefile
index 7f0b45a..82ec607 100644
--- 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 565280ec..974f56d 100644
--- 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 366f8c7..41564b1 100755
--- 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