340 files changed, 11 insertions, 11 deletions

diff --git a/arch/ia64/ia32/audit.c b/arch/ia64/ia32/audit.c
index 5e901c75df1b..5c93ddd1e42d 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 94fb24ea5afa..4fc79f3030e4 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 32f5fbe2d0d2..ef42ec01eaff 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 f5631da585b6..d1a47adb5aec 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 4a8e80cdcfa5..4a8e80cdcfa5 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 f5705761a37b..f5705761a37b 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 0948748bc69c..0948748bc69c 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 392e17336be1..392e17336be1 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 3617fd4fcdf9..3617fd4fcdf9 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 e2077d343c33..e2077d343c33 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 22d3c9862bf3..22d3c9862bf3 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 041d0db7da27..041d0db7da27 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 b3085869a17b..b3085869a17b 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 ef1d72dbdfe0..ef1d72dbdfe0 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 b922c85ac91d..b922c85ac91d 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 de4596b24c23..de4596b24c23 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 e1355f44d7c3..e1355f44d7c3 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 4e1b8873c474..4e1b8873c474 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 14d3f0beb889..14d3f0beb889 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 2cb218c4a356..2cb218c4a356 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 12c7cac74202..12c7cac74202 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 1d9543b9d358..1d9543b9d358 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 392c3f5ef2fe..392c3f5ef2fe 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 9404c535b7ec..9404c535b7ec 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 79b4b88505d7..79b4b88505d7 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 451a74762bd4..451a74762bd4 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 1d63bd5d5946..1d63bd5d5946 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 ccf027e2d97d..ccf027e2d97d 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 91ad43a54c47..91ad43a54c47 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 dc604985f2ad..dc604985f2ad 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 722f27d68105..722f27d68105 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 ea3f1cc06a97..ea3f1cc06a97 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 68840ef1b35a..68840ef1b35a 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 933fd272f826..933fd272f826 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 2bc162e0ec6e..2bc162e0ec6e 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 848850fd7d62..848850fd7d62 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 d041e8cda227..d041e8cda227 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 110f403beb89..110f403beb89 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 a460fa088d4c..a460fa088d4c 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 0622e45cdf7c..0622e45cdf7c 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 63c1a5e61b99..63c1a5e61b99 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 6732b150949e..6732b150949e 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 83a115083f0d..83a115083f0d 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 adfeae6586e1..adfeae6586e1 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 6d68ad7e0ea3..6d68ad7e0ea3 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 a863ead856f3..a863ead856f3 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 ecb6907c3ea4..ecb6907c3ea4 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 8a0da95b4fc5..8a0da95b4fc5 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 f06adac7938c..f06adac7938c 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 b881db664b46..b881db664b46 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 1bece04c7d9d..1bece04c7d9d 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 f9530f23f1d6..f9530f23f1d6 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 219c33d6361c..219c33d6361c 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 c9f7a4eec555..c9f7a4eec555 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 1cff6fe81fa5..1cff6fe81fa5 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 c3c953a45b21..c3c953a45b21 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 21d1bc32ad7c..21d1bc32ad7c 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 5abbdec06bd2..5abbdec06bd2 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 9493c5b27bbd..9493c5b27bbd 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 313438e63348..313438e63348 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 26bc15f01e78..26bc15f01e78 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 190d0d8b71e3..190d0d8b71e3 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 4c82b503d92f..4c82b503d92f 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 380f0b4f17ed..380f0b4f17ed 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 8b234a3cb851..8b234a3cb851 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 632a955fcc0a..632a955fcc0a 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 ed5a3caae141..ed5a3caae141 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 3ffc5a7bf667..3ffc5a7bf667 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 aca38dbd9a64..aca38dbd9a64 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 46ab12db5739..46ab12db5739 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 78e33a1bc591..78e33a1bc591 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 8844002da0e0..8844002da0e0 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 dab4751d1307..dab4751d1307 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 7d83a3a83e37..7d83a3a83e37 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 06850a7194e1..06850a7194e1 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 1bb6f9bbe1ab..1bb6f9bbe1ab 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 06b924ef6fa5..06b924ef6fa5 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 605edb39ef9e..605edb39ef9e 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 d48bee663a6f..d48bee663a6f 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 6fe4f81bfcf9..6fe4f81bfcf9 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 ed6a4886c082..ed6a4886c082 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 3f3444be2638..3f3444be2638 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 497fb980d962..497fb980d962 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 000787df66e6..000787df66e6 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 700fe230d919..700fe230d919 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 f8bd2919a8ce..f8bd2919a8ce 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 bc3f6a280316..bc3f6a280316 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 58b273f6ef07..58b273f6ef07 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 0b7ec5dc0884..0b7ec5dc0884 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 749d042f0556..749d042f0556 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 cc011a3bc1c2..cc011a3bc1c2 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 9ba862a4eac0..9ba862a4eac0 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 15a5b530044e..15a5b530044e 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 23c1b3baaecd..23c1b3baaecd 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 f932f7ad51dd..f932f7ad51dd 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 dbd887d8a5a5..dbd887d8a5a5 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 baa3f783d27d..baa3f783d27d 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 07c03c6c9a16..07c03c6c9a16 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 a233f835e0b5..a233f835e0b5 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 4f7d878bda18..4f7d878bda18 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 ee6e086b7dfe..ee6e086b7dfe 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 d35cbd7aa587..d35cbd7aa587 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 b279fe06dfe5..b279fe06dfe5 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 06752a649044..06752a649044 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 961e746da977..961e746da977 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 910304fbdc8f..910304fbdc8f 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 30a692cfaff8..30a692cfaff8 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 1e5f2909c1db..1e5f2909c1db 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 89c898ab298b..89c898ab298b 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 316a3b258871..316a3b258871 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 3dd9c0b70270..3dd9c0b70270 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 78242c6ffa58..78242c6ffa58 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 a8d065d85f57..a8d065d85f57 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 2bdab21f0898..2bdab21f0898 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 35a2fe9bc921..35a2fe9bc921 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 2bbaf4370a55..2bbaf4370a55 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 fbbab66ee9df..fbbab66ee9df 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 ea09600d6129..ea09600d6129 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 d283863354de..d283863354de 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 89f44493e643..89f44493e643 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 8a0748d01036..8a0748d01036 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 ba0dd791fadf..ba0dd791fadf 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 411fb8cfb24e..411fb8cfb24e 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 30054fded4fb..30054fded4fb 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 e2d9b030c1ac..e2d9b030c1ac 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 a5228504d867..a5228504d867 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 7505e947ed27..7505e947ed27 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 8f034ba4b53e..8f034ba4b53e 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 42d8b62ee8ab..42d8b62ee8ab 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 ae91994fd6c9..ae91994fd6c9 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 2aa61b54fbd5..2aa61b54fbd5 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 23ecda0b28a0..23ecda0b28a0 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 6b1add8e31dd..6b1add8e31dd 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 3c66f2cdaec1..3c66f2cdaec1 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 0c2d41c41b20..0c2d41c41b20 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 674bc7e50c35..674bc7e50c35 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 9c381f2815ac..9c381f2815ac 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 d77646f011f1..d77646f011f1 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 990b15833834..990b15833834 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 ff8778f26b84..ff8778f26b84 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 361b810f5160..361b810f5160 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 ed0bab427354..ed0bab427354 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 38846208b548..38846208b548 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 dbab36d64d48..dbab36d64d48 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 6ce0f7786ef8..6ce0f7786ef8 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 5085b52da301..5085b52da301 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 1657f38b8f27..1657f38b8f27 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 f67433dbd65f..f67433dbd65f 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 3115564e557c..3115564e557c 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 6061b153613e..6061b153613e 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 94b6cdf532e2..94b6cdf532e2 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 c8e9c8bed3d0..c8e9c8bed3d0 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 9e5a459fd15b..9e5a459fd15b 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 ae52624b5937..ae52624b5937 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 71729ca05cd7..71729ca05cd7 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 5768d8e95c8c..5768d8e95c8c 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 a995f33176cd..a995f33176cd 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 60d1ed287b13..60d1ed287b13 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 49f22be237d2..49f22be237d2 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 036133eaf744..036133eaf744 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 62c793bb70ca..62c793bb70ca 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 4ef28e6de383..4ef28e6de383 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 fb79b1cf5d07..fb79b1cf5d07 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 9d5aff14334a..9d5aff14334a 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 8ec940bfd079..8ec940bfd079 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 cce6f6e4afd6..cce6f6e4afd6 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 26758673c828..26758673c828 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 2e7299bb3653..2e7299bb3653 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 64217ea16a36..64217ea16a36 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 121b65d61d86..121b65d61d86 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 6480f3333b2a..6480f3333b2a 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 864f2005fc1d..864f2005fc1d 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 be2241a818f1..be2241a818f1 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 79166b048012..79166b048012 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 1b538c907a3d..1b538c907a3d 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 ed9190246876..ed9190246876 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 dabd10f0bbee..dabd10f0bbee 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 530af1f6389e..530af1f6389e 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 23a7f83da953..23a7f83da953 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 a731b9c573a6..a731b9c573a6 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 25c16d8ba3c7..25c16d8ba3c7 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 918ba21ab9d9..918ba21ab9d9 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 a53f829a97c5..a53f829a97c5 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 ae742721ae73..ae742721ae73 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 27da400d3138..27da400d3138 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 44cb07855c5b..44cb07855c5b 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 15c990395b02..15c990395b02 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 124bf7d4b70a..124bf7d4b70a 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 0bf2a06b7a4e..0bf2a06b7a4e 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 e012a46cc22a..e012a46cc22a 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 935588d286cf..935588d286cf 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 252292e077b6..252292e077b6 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 c577bda5b1c5..c577bda5b1c5 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 d7328b1a05c1..d7328b1a05c1 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 d4f1d5791fc1..d4f1d5791fc1 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 bdf5dba4cfb0..bdf5dba4cfb0 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 49380b8c7e25..49380b8c7e25 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 0009cfb11a5f..0009cfb11a5f 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 8d6ae2f760d0..8d6ae2f760d0 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 2e3dda4dc3d9..2e3dda4dc3d9 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 482c3e3f9879..482c3e3f9879 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 da42be07b690..da42be07b690 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 602583192991..602583192991 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 3f2288207c0c..3f2288207c0c 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 f72e12d5770e..f72e12d5770e 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 80860afffbdb..80860afffbdb 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 e10a1d0678cf..e10a1d0678cf 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 3cd23adedae8..3cd23adedae8 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 7ec48f4e5347..7ec48f4e5347 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 81762081dcd8..81762081dcd8 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 c05fe6ff3720..c05fe6ff3720 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 75f4276b5ddb..75f4276b5ddb 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 88a53b1a17f0..88a53b1a17f0 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 8de702dc7d62..8de702dc7d62 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 fde9770e53d1..fde9770e53d1 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 c98509d3149e..c98509d3149e 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 bb7133dc155d..bb7133dc155d 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 70cf2bb05939..70cf2bb05939 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 388b4e7f4a44..388b4e7f4a44 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 e7ae34eb4103..e7ae34eb4103 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 1198f2a0e42c..1198f2a0e42c 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 dc5f0712f9fa..dc5f0712f9fa 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 ee7cbb30773a..ee7cbb30773a 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 6e89e8b4de0e..6e89e8b4de0e 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 4298b8882a78..4298b8882a78 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 a2025525a15a..a2025525a15a 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 edb3b4ecfc81..edb3b4ecfc81 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 ad29e277fd6d..ad29e277fd6d 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 1c2f0ce9e31e..1c2f0ce9e31e 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 2c2987d97570..2c2987d97570 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 a01c4e376331..a01c4e376331 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 04bc4db8921b..04bc4db8921b 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 e39376d7de50..e39376d7de50 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 5e1256bdee83..5e1256bdee83 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 f71c3b0ed360..f71c3b0ed360 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 48a3109e1a7d..48a3109e1a7d 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 3ff3015b71a8..3ff3015b71a8 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 ee48f880005d..ee48f880005d 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 c62e58a5a90d..c62e58a5a90d 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 cf9ab2dbcef1..cf9ab2dbcef1 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 03274cea751f..03274cea751f 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 2b8c5160388f..2b8c5160388f 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 5d6e69454891..5d6e69454891 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 81f06b7e5a3f..81f06b7e5a3f 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 303660b671e5..303660b671e5 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 11b6cc14b289..11b6cc14b289 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 f51aec2298e9..f51aec2298e9 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 a83a1fd96a0e..a83a1fd96a0e 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 ee813f4fe5d5..ee813f4fe5d5 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 8c347032c2f2..8c347032c2f2 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 808bdfb2958c..808bdfb2958c 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 65acc82d267a..65acc82d267a 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 a6afc29f2dd9..a6afc29f2dd9 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 db73274c83c3..db73274c83c3 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 a006704fdc84..a006704fdc84 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 38f8e6bc3186..38f8e6bc3186 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 157ff7fab97a..157ff7fab97a 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 6aa9b562c508..6aa9b562c508 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 5363e4f7e1cd..5363e4f7e1cd 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 f43517e28532..f43517e28532 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 1e120f628905..1e120f628905 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 ca5dc19dd461..ca5dc19dd461 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 6dfd6d9373a0..6dfd6d9373a0 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 487843ed245a..487843ed245a 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 a2add11d3b66..a2add11d3b66 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 9b3070f1c2ac..9b3070f1c2ac 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 f3fbca1f61c1..f3fbca1f61c1 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 53bd1e7bd7b4..53bd1e7bd7b4 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 013ce6fab2d5..013ce6fab2d5 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 9bd521fe4570..9bd521fe4570 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 acb6d4d491f4..acb6d4d491f4 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 cf821dd310e8..cf821dd310e8 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 1e20adbcad4b..1e20adbcad4b 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 b689bee71104..b689bee71104 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 04c47dc5597c..04c47dc5597c 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 87803da44010..87803da44010 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 b20c894660f9..b20c894660f9 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 5aedb8bffc5a..5aedb8bffc5a 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 e7932d7fbbab..e7932d7fbbab 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 3d00dc5e0c71..3d00dc5e0c71 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 e235db248071..e235db248071 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 1c7f57b6b66e..1c7f57b6b66e 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 3f4e52bb77f5..3f4e52bb77f5 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 3e724eef7ac4..3e724eef7ac4 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 d0babce4b47a..d0babce4b47a 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 d1ce2416a5da..d1ce2416a5da 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 db36e9e89e87..db36e9e89e87 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 3cdd08b5bdb7..3cdd08b5bdb7 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 7eca9bc022b2..7eca9bc022b2 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 0406bbd898a9..0406bbd898a9 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 6c3dc2c65751..6c3dc2c65751 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 ad0f5c41e78c..ad0f5c41e78c 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 e78b52e17444..e78b52e17444 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 48ebc0ad40ec..48ebc0ad40ec 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 6b5b57d9c6d1..6b5b57d9c6d1 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 c96c1f5d07a2..c96c1f5d07a2 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 89eaa5456a7e..89eaa5456a7e 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 59dcdec37160..59dcdec37160 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 2a58ed3e51d8..2a58ed3e51d8 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 017f4a87c913..017f4a87c913 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 ace83f1f6787..ace83f1f6787 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 a2151567db44..a2151567db44 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 999873b22e7f..999873b22e7f 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 aa66c1857f06..aa66c1857f06 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 e0fe2f55f1a6..e0fe2f55f1a6 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 38b5799863b4..38b5799863b4 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 215f1969c266..215f1969c266 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 77153fb18f5e..77153fb18f5e 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 bdb5b01afbf5..bdb5b01afbf5 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 8bf5f32da9c6..8bf5f32da9c6 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 8b03d89d2459..8b03d89d2459 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 4ab320913ea3..4ab320913ea3 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 b9e493d07d07..b9e493d07d07 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 38fd13364021..38fd13364021 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 53100f353612..53100f353612 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 9627a8fe84e9..9627a8fe84e9 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 b36d3b378c63..b36d3b378c63 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 61c938045ec9..61c938045ec9 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 5fbf63e1003c..5fbf63e1003c 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 998bd18eb737..998bd18eb737 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 b7c0dea119fe..b7c0dea119fe 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 b2d39e6a08b7..b2d39e6a08b7 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 9c811d2e6f91..9c811d2e6f91 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 dcd4682413de..dcd4682413de 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 f2cba4e79a23..f2cba4e79a23 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 8151f5b8b6cb..8151f5b8b6cb 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 c4baab4d2b68..c4baab4d2b68 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 44f4259bee3f..44f4259bee3f 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 445a24759560..445a24759560 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 d077bba96da9..d077bba96da9 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 08167e19fc66..08167e19fc66 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 046c0f1e01d4..046c0f1e01d4 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 d5eada0a48d9..d5eada0a48d9 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 11b3bb86e17b..11b3bb86e17b 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 921b45840449..921b45840449 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 2d3a18de295b..2d3a18de295b 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 08e9a1ac07a9..08e9a1ac07a9 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 7f0b45a5d788..82ec6075c057 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 565280ec1c6a..974f56d1ebe1 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 366f8c7f62bf..41564b142c04 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