aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--arch/ia64/ia32/audit.c2
-rw-r--r--arch/um/Makefile4
-rw-r--r--arch/um/sys-x86_64/syscall_table.c4
-rw-r--r--arch/x86/Makefile6
-rw-r--r--arch/x86/include/asm/Kbuild (renamed from include/asm-x86/Kbuild)0
-rw-r--r--arch/x86/include/asm/a.out-core.h (renamed from include/asm-x86/a.out-core.h)0
-rw-r--r--arch/x86/include/asm/a.out.h (renamed from include/asm-x86/a.out.h)0
-rw-r--r--arch/x86/include/asm/acpi.h (renamed from include/asm-x86/acpi.h)0
-rw-r--r--arch/x86/include/asm/agp.h (renamed from include/asm-x86/agp.h)0
-rw-r--r--arch/x86/include/asm/alternative-asm.h (renamed from include/asm-x86/alternative-asm.h)0
-rw-r--r--arch/x86/include/asm/alternative.h (renamed from include/asm-x86/alternative.h)0
-rw-r--r--arch/x86/include/asm/amd_iommu.h (renamed from include/asm-x86/amd_iommu.h)0
-rw-r--r--arch/x86/include/asm/amd_iommu_types.h (renamed from include/asm-x86/amd_iommu_types.h)0
-rw-r--r--arch/x86/include/asm/apic.h (renamed from include/asm-x86/apic.h)0
-rw-r--r--arch/x86/include/asm/apicdef.h (renamed from include/asm-x86/apicdef.h)0
-rw-r--r--arch/x86/include/asm/arch_hooks.h (renamed from include/asm-x86/arch_hooks.h)0
-rw-r--r--arch/x86/include/asm/asm.h (renamed from include/asm-x86/asm.h)0
-rw-r--r--arch/x86/include/asm/atomic.h (renamed from include/asm-x86/atomic.h)0
-rw-r--r--arch/x86/include/asm/atomic_32.h (renamed from include/asm-x86/atomic_32.h)0
-rw-r--r--arch/x86/include/asm/atomic_64.h (renamed from include/asm-x86/atomic_64.h)0
-rw-r--r--arch/x86/include/asm/auxvec.h (renamed from include/asm-x86/auxvec.h)0
-rw-r--r--arch/x86/include/asm/bigsmp/apic.h (renamed from include/asm-x86/bigsmp/apic.h)0
-rw-r--r--arch/x86/include/asm/bigsmp/apicdef.h (renamed from include/asm-x86/bigsmp/apicdef.h)0
-rw-r--r--arch/x86/include/asm/bigsmp/ipi.h (renamed from include/asm-x86/bigsmp/ipi.h)0
-rw-r--r--arch/x86/include/asm/bios_ebda.h (renamed from include/asm-x86/bios_ebda.h)0
-rw-r--r--arch/x86/include/asm/bitops.h (renamed from include/asm-x86/bitops.h)0
-rw-r--r--arch/x86/include/asm/boot.h (renamed from include/asm-x86/boot.h)0
-rw-r--r--arch/x86/include/asm/bootparam.h (renamed from include/asm-x86/bootparam.h)0
-rw-r--r--arch/x86/include/asm/bug.h (renamed from include/asm-x86/bug.h)0
-rw-r--r--arch/x86/include/asm/bugs.h (renamed from include/asm-x86/bugs.h)0
-rw-r--r--arch/x86/include/asm/byteorder.h (renamed from include/asm-x86/byteorder.h)0
-rw-r--r--arch/x86/include/asm/cache.h (renamed from include/asm-x86/cache.h)0
-rw-r--r--arch/x86/include/asm/cacheflush.h (renamed from include/asm-x86/cacheflush.h)0
-rw-r--r--arch/x86/include/asm/calgary.h (renamed from include/asm-x86/calgary.h)0
-rw-r--r--arch/x86/include/asm/calling.h (renamed from include/asm-x86/calling.h)0
-rw-r--r--arch/x86/include/asm/checksum.h (renamed from include/asm-x86/checksum.h)0
-rw-r--r--arch/x86/include/asm/checksum_32.h (renamed from include/asm-x86/checksum_32.h)0
-rw-r--r--arch/x86/include/asm/checksum_64.h (renamed from include/asm-x86/checksum_64.h)0
-rw-r--r--arch/x86/include/asm/cmpxchg.h (renamed from include/asm-x86/cmpxchg.h)0
-rw-r--r--arch/x86/include/asm/cmpxchg_32.h (renamed from include/asm-x86/cmpxchg_32.h)0
-rw-r--r--arch/x86/include/asm/cmpxchg_64.h (renamed from include/asm-x86/cmpxchg_64.h)0
-rw-r--r--arch/x86/include/asm/compat.h (renamed from include/asm-x86/compat.h)0
-rw-r--r--arch/x86/include/asm/cpu.h (renamed from include/asm-x86/cpu.h)0
-rw-r--r--arch/x86/include/asm/cpufeature.h (renamed from include/asm-x86/cpufeature.h)0
-rw-r--r--arch/x86/include/asm/cputime.h (renamed from include/asm-x86/cputime.h)0
-rw-r--r--arch/x86/include/asm/current.h (renamed from include/asm-x86/current.h)0
-rw-r--r--arch/x86/include/asm/debugreg.h (renamed from include/asm-x86/debugreg.h)0
-rw-r--r--arch/x86/include/asm/delay.h (renamed from include/asm-x86/delay.h)0
-rw-r--r--arch/x86/include/asm/desc.h (renamed from include/asm-x86/desc.h)0
-rw-r--r--arch/x86/include/asm/desc_defs.h (renamed from include/asm-x86/desc_defs.h)0
-rw-r--r--arch/x86/include/asm/device.h (renamed from include/asm-x86/device.h)0
-rw-r--r--arch/x86/include/asm/div64.h (renamed from include/asm-x86/div64.h)0
-rw-r--r--arch/x86/include/asm/dma-mapping.h (renamed from include/asm-x86/dma-mapping.h)0
-rw-r--r--arch/x86/include/asm/dma.h (renamed from include/asm-x86/dma.h)0
-rw-r--r--arch/x86/include/asm/dmi.h (renamed from include/asm-x86/dmi.h)0
-rw-r--r--arch/x86/include/asm/ds.h (renamed from include/asm-x86/ds.h)0
-rw-r--r--arch/x86/include/asm/dwarf2.h (renamed from include/asm-x86/dwarf2.h)0
-rw-r--r--arch/x86/include/asm/e820.h (renamed from include/asm-x86/e820.h)0
-rw-r--r--arch/x86/include/asm/edac.h (renamed from include/asm-x86/edac.h)0
-rw-r--r--arch/x86/include/asm/efi.h (renamed from include/asm-x86/efi.h)0
-rw-r--r--arch/x86/include/asm/elf.h (renamed from include/asm-x86/elf.h)0
-rw-r--r--arch/x86/include/asm/emergency-restart.h (renamed from include/asm-x86/emergency-restart.h)0
-rw-r--r--arch/x86/include/asm/errno.h (renamed from include/asm-x86/errno.h)0
-rw-r--r--arch/x86/include/asm/es7000/apic.h (renamed from include/asm-x86/es7000/apic.h)0
-rw-r--r--arch/x86/include/asm/es7000/apicdef.h (renamed from include/asm-x86/es7000/apicdef.h)0
-rw-r--r--arch/x86/include/asm/es7000/ipi.h (renamed from include/asm-x86/es7000/ipi.h)0
-rw-r--r--arch/x86/include/asm/es7000/mpparse.h (renamed from include/asm-x86/es7000/mpparse.h)0
-rw-r--r--arch/x86/include/asm/es7000/wakecpu.h (renamed from include/asm-x86/es7000/wakecpu.h)0
-rw-r--r--arch/x86/include/asm/fb.h (renamed from include/asm-x86/fb.h)0
-rw-r--r--arch/x86/include/asm/fcntl.h (renamed from include/asm-x86/fcntl.h)0
-rw-r--r--arch/x86/include/asm/fixmap.h (renamed from include/asm-x86/fixmap.h)0
-rw-r--r--arch/x86/include/asm/fixmap_32.h (renamed from include/asm-x86/fixmap_32.h)0
-rw-r--r--arch/x86/include/asm/fixmap_64.h (renamed from include/asm-x86/fixmap_64.h)0
-rw-r--r--arch/x86/include/asm/floppy.h (renamed from include/asm-x86/floppy.h)0
-rw-r--r--arch/x86/include/asm/frame.h (renamed from include/asm-x86/frame.h)0
-rw-r--r--arch/x86/include/asm/ftrace.h (renamed from include/asm-x86/ftrace.h)0
-rw-r--r--arch/x86/include/asm/futex.h (renamed from include/asm-x86/futex.h)0
-rw-r--r--arch/x86/include/asm/gart.h (renamed from include/asm-x86/gart.h)0
-rw-r--r--arch/x86/include/asm/genapic.h (renamed from include/asm-x86/genapic.h)0
-rw-r--r--arch/x86/include/asm/genapic_32.h (renamed from include/asm-x86/genapic_32.h)0
-rw-r--r--arch/x86/include/asm/genapic_64.h (renamed from include/asm-x86/genapic_64.h)0
-rw-r--r--arch/x86/include/asm/geode.h (renamed from include/asm-x86/geode.h)0
-rw-r--r--arch/x86/include/asm/gpio.h (renamed from include/asm-x86/gpio.h)0
-rw-r--r--arch/x86/include/asm/hardirq.h (renamed from include/asm-x86/hardirq.h)0
-rw-r--r--arch/x86/include/asm/hardirq_32.h (renamed from include/asm-x86/hardirq_32.h)0
-rw-r--r--arch/x86/include/asm/hardirq_64.h (renamed from include/asm-x86/hardirq_64.h)0
-rw-r--r--arch/x86/include/asm/highmem.h (renamed from include/asm-x86/highmem.h)0
-rw-r--r--arch/x86/include/asm/hpet.h (renamed from include/asm-x86/hpet.h)0
-rw-r--r--arch/x86/include/asm/hugetlb.h (renamed from include/asm-x86/hugetlb.h)0
-rw-r--r--arch/x86/include/asm/hw_irq.h (renamed from include/asm-x86/hw_irq.h)0
-rw-r--r--arch/x86/include/asm/hypertransport.h (renamed from include/asm-x86/hypertransport.h)0
-rw-r--r--arch/x86/include/asm/i387.h (renamed from include/asm-x86/i387.h)0
-rw-r--r--arch/x86/include/asm/i8253.h (renamed from include/asm-x86/i8253.h)0
-rw-r--r--arch/x86/include/asm/i8259.h (renamed from include/asm-x86/i8259.h)0
-rw-r--r--arch/x86/include/asm/ia32.h (renamed from include/asm-x86/ia32.h)0
-rw-r--r--arch/x86/include/asm/ia32_unistd.h (renamed from include/asm-x86/ia32_unistd.h)0
-rw-r--r--arch/x86/include/asm/idle.h (renamed from include/asm-x86/idle.h)0
-rw-r--r--arch/x86/include/asm/intel_arch_perfmon.h (renamed from include/asm-x86/intel_arch_perfmon.h)0
-rw-r--r--arch/x86/include/asm/io.h (renamed from include/asm-x86/io.h)0
-rw-r--r--arch/x86/include/asm/io_32.h (renamed from include/asm-x86/io_32.h)0
-rw-r--r--arch/x86/include/asm/io_64.h (renamed from include/asm-x86/io_64.h)0
-rw-r--r--arch/x86/include/asm/io_apic.h (renamed from include/asm-x86/io_apic.h)0
-rw-r--r--arch/x86/include/asm/ioctl.h (renamed from include/asm-x86/ioctl.h)0
-rw-r--r--arch/x86/include/asm/ioctls.h (renamed from include/asm-x86/ioctls.h)0
-rw-r--r--arch/x86/include/asm/iommu.h (renamed from include/asm-x86/iommu.h)0
-rw-r--r--arch/x86/include/asm/ipcbuf.h (renamed from include/asm-x86/ipcbuf.h)0
-rw-r--r--arch/x86/include/asm/ipi.h (renamed from include/asm-x86/ipi.h)0
-rw-r--r--arch/x86/include/asm/irq.h (renamed from include/asm-x86/irq.h)0
-rw-r--r--arch/x86/include/asm/irq_regs.h (renamed from include/asm-x86/irq_regs.h)0
-rw-r--r--arch/x86/include/asm/irq_regs_32.h (renamed from include/asm-x86/irq_regs_32.h)0
-rw-r--r--arch/x86/include/asm/irq_regs_64.h (renamed from include/asm-x86/irq_regs_64.h)0
-rw-r--r--arch/x86/include/asm/irq_remapping.h (renamed from include/asm-x86/irq_remapping.h)0
-rw-r--r--arch/x86/include/asm/irq_vectors.h (renamed from include/asm-x86/irq_vectors.h)0
-rw-r--r--arch/x86/include/asm/irqflags.h (renamed from include/asm-x86/irqflags.h)0
-rw-r--r--arch/x86/include/asm/ist.h (renamed from include/asm-x86/ist.h)0
-rw-r--r--arch/x86/include/asm/k8.h (renamed from include/asm-x86/k8.h)0
-rw-r--r--arch/x86/include/asm/kdebug.h (renamed from include/asm-x86/kdebug.h)0
-rw-r--r--arch/x86/include/asm/kexec.h (renamed from include/asm-x86/kexec.h)0
-rw-r--r--arch/x86/include/asm/kgdb.h (renamed from include/asm-x86/kgdb.h)0
-rw-r--r--arch/x86/include/asm/kmap_types.h (renamed from include/asm-x86/kmap_types.h)0
-rw-r--r--arch/x86/include/asm/kprobes.h (renamed from include/asm-x86/kprobes.h)0
-rw-r--r--arch/x86/include/asm/kvm.h (renamed from include/asm-x86/kvm.h)0
-rw-r--r--arch/x86/include/asm/kvm_host.h (renamed from include/asm-x86/kvm_host.h)0
-rw-r--r--arch/x86/include/asm/kvm_para.h (renamed from include/asm-x86/kvm_para.h)0
-rw-r--r--arch/x86/include/asm/kvm_x86_emulate.h (renamed from include/asm-x86/kvm_x86_emulate.h)0
-rw-r--r--arch/x86/include/asm/ldt.h (renamed from include/asm-x86/ldt.h)0
-rw-r--r--arch/x86/include/asm/lguest.h (renamed from include/asm-x86/lguest.h)0
-rw-r--r--arch/x86/include/asm/lguest_hcall.h (renamed from include/asm-x86/lguest_hcall.h)0
-rw-r--r--arch/x86/include/asm/linkage.h (renamed from include/asm-x86/linkage.h)0
-rw-r--r--arch/x86/include/asm/local.h (renamed from include/asm-x86/local.h)0
-rw-r--r--arch/x86/include/asm/mach-default/apm.h (renamed from include/asm-x86/mach-default/apm.h)0
-rw-r--r--arch/x86/include/asm/mach-default/do_timer.h (renamed from include/asm-x86/mach-default/do_timer.h)0
-rw-r--r--arch/x86/include/asm/mach-default/entry_arch.h (renamed from include/asm-x86/mach-default/entry_arch.h)0
-rw-r--r--arch/x86/include/asm/mach-default/mach_apic.h (renamed from include/asm-x86/mach-default/mach_apic.h)0
-rw-r--r--arch/x86/include/asm/mach-default/mach_apicdef.h (renamed from include/asm-x86/mach-default/mach_apicdef.h)0
-rw-r--r--arch/x86/include/asm/mach-default/mach_ipi.h (renamed from include/asm-x86/mach-default/mach_ipi.h)0
-rw-r--r--arch/x86/include/asm/mach-default/mach_mpparse.h (renamed from include/asm-x86/mach-default/mach_mpparse.h)0
-rw-r--r--arch/x86/include/asm/mach-default/mach_mpspec.h (renamed from include/asm-x86/mach-default/mach_mpspec.h)0
-rw-r--r--arch/x86/include/asm/mach-default/mach_timer.h (renamed from include/asm-x86/mach-default/mach_timer.h)0
-rw-r--r--arch/x86/include/asm/mach-default/mach_traps.h (renamed from include/asm-x86/mach-default/mach_traps.h)0
-rw-r--r--arch/x86/include/asm/mach-default/mach_wakecpu.h (renamed from include/asm-x86/mach-default/mach_wakecpu.h)0
-rw-r--r--arch/x86/include/asm/mach-default/pci-functions.h (renamed from include/asm-x86/mach-default/pci-functions.h)0
-rw-r--r--arch/x86/include/asm/mach-default/setup_arch.h (renamed from include/asm-x86/mach-default/setup_arch.h)0
-rw-r--r--arch/x86/include/asm/mach-default/smpboot_hooks.h (renamed from include/asm-x86/mach-default/smpboot_hooks.h)0
-rw-r--r--arch/x86/include/asm/mach-generic/gpio.h (renamed from include/asm-x86/mach-generic/gpio.h)0
-rw-r--r--arch/x86/include/asm/mach-generic/mach_apic.h (renamed from include/asm-x86/mach-generic/mach_apic.h)0
-rw-r--r--arch/x86/include/asm/mach-generic/mach_apicdef.h (renamed from include/asm-x86/mach-generic/mach_apicdef.h)0
-rw-r--r--arch/x86/include/asm/mach-generic/mach_ipi.h (renamed from include/asm-x86/mach-generic/mach_ipi.h)0
-rw-r--r--arch/x86/include/asm/mach-generic/mach_mpparse.h (renamed from include/asm-x86/mach-generic/mach_mpparse.h)0
-rw-r--r--arch/x86/include/asm/mach-generic/mach_mpspec.h (renamed from include/asm-x86/mach-generic/mach_mpspec.h)0
-rw-r--r--arch/x86/include/asm/mach-rdc321x/gpio.h (renamed from include/asm-x86/mach-rdc321x/gpio.h)0
-rw-r--r--arch/x86/include/asm/mach-rdc321x/rdc321x_defs.h (renamed from include/asm-x86/mach-rdc321x/rdc321x_defs.h)0
-rw-r--r--arch/x86/include/asm/mach-voyager/do_timer.h (renamed from include/asm-x86/mach-voyager/do_timer.h)0
-rw-r--r--arch/x86/include/asm/mach-voyager/entry_arch.h (renamed from include/asm-x86/mach-voyager/entry_arch.h)0
-rw-r--r--arch/x86/include/asm/mach-voyager/setup_arch.h (renamed from include/asm-x86/mach-voyager/setup_arch.h)0
-rw-r--r--arch/x86/include/asm/math_emu.h (renamed from include/asm-x86/math_emu.h)0
-rw-r--r--arch/x86/include/asm/mc146818rtc.h (renamed from include/asm-x86/mc146818rtc.h)0
-rw-r--r--arch/x86/include/asm/mca.h (renamed from include/asm-x86/mca.h)0
-rw-r--r--arch/x86/include/asm/mca_dma.h (renamed from include/asm-x86/mca_dma.h)0
-rw-r--r--arch/x86/include/asm/mce.h (renamed from include/asm-x86/mce.h)0
-rw-r--r--arch/x86/include/asm/microcode.h (renamed from include/asm-x86/microcode.h)0
-rw-r--r--arch/x86/include/asm/mman.h (renamed from include/asm-x86/mman.h)0
-rw-r--r--arch/x86/include/asm/mmconfig.h (renamed from include/asm-x86/mmconfig.h)0
-rw-r--r--arch/x86/include/asm/mmu.h (renamed from include/asm-x86/mmu.h)0
-rw-r--r--arch/x86/include/asm/mmu_context.h (renamed from include/asm-x86/mmu_context.h)0
-rw-r--r--arch/x86/include/asm/mmu_context_32.h (renamed from include/asm-x86/mmu_context_32.h)0
-rw-r--r--arch/x86/include/asm/mmu_context_64.h (renamed from include/asm-x86/mmu_context_64.h)0
-rw-r--r--arch/x86/include/asm/mmx.h (renamed from include/asm-x86/mmx.h)0
-rw-r--r--arch/x86/include/asm/mmzone.h (renamed from include/asm-x86/mmzone.h)0
-rw-r--r--arch/x86/include/asm/mmzone_32.h (renamed from include/asm-x86/mmzone_32.h)0
-rw-r--r--arch/x86/include/asm/mmzone_64.h (renamed from include/asm-x86/mmzone_64.h)0
-rw-r--r--arch/x86/include/asm/module.h (renamed from include/asm-x86/module.h)0
-rw-r--r--arch/x86/include/asm/mpspec.h (renamed from include/asm-x86/mpspec.h)0
-rw-r--r--arch/x86/include/asm/mpspec_def.h (renamed from include/asm-x86/mpspec_def.h)0
-rw-r--r--arch/x86/include/asm/msgbuf.h (renamed from include/asm-x86/msgbuf.h)0
-rw-r--r--arch/x86/include/asm/msidef.h (renamed from include/asm-x86/msidef.h)0
-rw-r--r--arch/x86/include/asm/msr-index.h (renamed from include/asm-x86/msr-index.h)0
-rw-r--r--arch/x86/include/asm/msr.h (renamed from include/asm-x86/msr.h)0
-rw-r--r--arch/x86/include/asm/mtrr.h (renamed from include/asm-x86/mtrr.h)0
-rw-r--r--arch/x86/include/asm/mutex.h (renamed from include/asm-x86/mutex.h)0
-rw-r--r--arch/x86/include/asm/mutex_32.h (renamed from include/asm-x86/mutex_32.h)0
-rw-r--r--arch/x86/include/asm/mutex_64.h (renamed from include/asm-x86/mutex_64.h)0
-rw-r--r--arch/x86/include/asm/nmi.h (renamed from include/asm-x86/nmi.h)0
-rw-r--r--arch/x86/include/asm/nops.h (renamed from include/asm-x86/nops.h)0
-rw-r--r--arch/x86/include/asm/numa.h (renamed from include/asm-x86/numa.h)0
-rw-r--r--arch/x86/include/asm/numa_32.h (renamed from include/asm-x86/numa_32.h)0
-rw-r--r--arch/x86/include/asm/numa_64.h (renamed from include/asm-x86/numa_64.h)0
-rw-r--r--arch/x86/include/asm/numaq.h (renamed from include/asm-x86/numaq.h)0
-rw-r--r--arch/x86/include/asm/numaq/apic.h (renamed from include/asm-x86/numaq/apic.h)0
-rw-r--r--arch/x86/include/asm/numaq/apicdef.h (renamed from include/asm-x86/numaq/apicdef.h)0
-rw-r--r--arch/x86/include/asm/numaq/ipi.h (renamed from include/asm-x86/numaq/ipi.h)0
-rw-r--r--arch/x86/include/asm/numaq/mpparse.h (renamed from include/asm-x86/numaq/mpparse.h)0
-rw-r--r--arch/x86/include/asm/numaq/wakecpu.h (renamed from include/asm-x86/numaq/wakecpu.h)0
-rw-r--r--arch/x86/include/asm/olpc.h (renamed from include/asm-x86/olpc.h)0
-rw-r--r--arch/x86/include/asm/page.h (renamed from include/asm-x86/page.h)0
-rw-r--r--arch/x86/include/asm/page_32.h (renamed from include/asm-x86/page_32.h)0
-rw-r--r--arch/x86/include/asm/page_64.h (renamed from include/asm-x86/page_64.h)0
-rw-r--r--arch/x86/include/asm/param.h (renamed from include/asm-x86/param.h)0
-rw-r--r--arch/x86/include/asm/paravirt.h (renamed from include/asm-x86/paravirt.h)0
-rw-r--r--arch/x86/include/asm/parport.h (renamed from include/asm-x86/parport.h)0
-rw-r--r--arch/x86/include/asm/pat.h (renamed from include/asm-x86/pat.h)0
-rw-r--r--arch/x86/include/asm/pci-direct.h (renamed from include/asm-x86/pci-direct.h)0
-rw-r--r--arch/x86/include/asm/pci.h (renamed from include/asm-x86/pci.h)0
-rw-r--r--arch/x86/include/asm/pci_32.h (renamed from include/asm-x86/pci_32.h)0
-rw-r--r--arch/x86/include/asm/pci_64.h (renamed from include/asm-x86/pci_64.h)0
-rw-r--r--arch/x86/include/asm/pda.h (renamed from include/asm-x86/pda.h)0
-rw-r--r--arch/x86/include/asm/percpu.h (renamed from include/asm-x86/percpu.h)0
-rw-r--r--arch/x86/include/asm/pgalloc.h (renamed from include/asm-x86/pgalloc.h)0
-rw-r--r--arch/x86/include/asm/pgtable-2level-defs.h (renamed from include/asm-x86/pgtable-2level-defs.h)0
-rw-r--r--arch/x86/include/asm/pgtable-2level.h (renamed from include/asm-x86/pgtable-2level.h)0
-rw-r--r--arch/x86/include/asm/pgtable-3level-defs.h (renamed from include/asm-x86/pgtable-3level-defs.h)0
-rw-r--r--arch/x86/include/asm/pgtable-3level.h (renamed from include/asm-x86/pgtable-3level.h)0
-rw-r--r--arch/x86/include/asm/pgtable.h (renamed from include/asm-x86/pgtable.h)0
-rw-r--r--arch/x86/include/asm/pgtable_32.h (renamed from include/asm-x86/pgtable_32.h)0
-rw-r--r--arch/x86/include/asm/pgtable_64.h (renamed from include/asm-x86/pgtable_64.h)0
-rw-r--r--arch/x86/include/asm/poll.h (renamed from include/asm-x86/poll.h)0
-rw-r--r--arch/x86/include/asm/posix_types.h (renamed from include/asm-x86/posix_types.h)0
-rw-r--r--arch/x86/include/asm/posix_types_32.h (renamed from include/asm-x86/posix_types_32.h)0
-rw-r--r--arch/x86/include/asm/posix_types_64.h (renamed from include/asm-x86/posix_types_64.h)0
-rw-r--r--arch/x86/include/asm/prctl.h (renamed from include/asm-x86/prctl.h)0
-rw-r--r--arch/x86/include/asm/processor-cyrix.h (renamed from include/asm-x86/processor-cyrix.h)0
-rw-r--r--arch/x86/include/asm/processor-flags.h (renamed from include/asm-x86/processor-flags.h)0
-rw-r--r--arch/x86/include/asm/processor.h (renamed from include/asm-x86/processor.h)0
-rw-r--r--arch/x86/include/asm/proto.h (renamed from include/asm-x86/proto.h)0
-rw-r--r--arch/x86/include/asm/ptrace-abi.h (renamed from include/asm-x86/ptrace-abi.h)0
-rw-r--r--arch/x86/include/asm/ptrace.h (renamed from include/asm-x86/ptrace.h)0
-rw-r--r--arch/x86/include/asm/pvclock-abi.h (renamed from include/asm-x86/pvclock-abi.h)0
-rw-r--r--arch/x86/include/asm/pvclock.h (renamed from include/asm-x86/pvclock.h)0
-rw-r--r--arch/x86/include/asm/reboot.h (renamed from include/asm-x86/reboot.h)0
-rw-r--r--arch/x86/include/asm/reboot_fixups.h (renamed from include/asm-x86/reboot_fixups.h)0
-rw-r--r--arch/x86/include/asm/required-features.h (renamed from include/asm-x86/required-features.h)0
-rw-r--r--arch/x86/include/asm/resource.h (renamed from include/asm-x86/resource.h)0
-rw-r--r--arch/x86/include/asm/resume-trace.h (renamed from include/asm-x86/resume-trace.h)0
-rw-r--r--arch/x86/include/asm/rio.h (renamed from include/asm-x86/rio.h)0
-rw-r--r--arch/x86/include/asm/rtc.h (renamed from include/asm-x86/rtc.h)0
-rw-r--r--arch/x86/include/asm/rwlock.h (renamed from include/asm-x86/rwlock.h)0
-rw-r--r--arch/x86/include/asm/rwsem.h (renamed from include/asm-x86/rwsem.h)0
-rw-r--r--arch/x86/include/asm/scatterlist.h (renamed from include/asm-x86/scatterlist.h)0
-rw-r--r--arch/x86/include/asm/seccomp.h (renamed from include/asm-x86/seccomp.h)0
-rw-r--r--arch/x86/include/asm/seccomp_32.h (renamed from include/asm-x86/seccomp_32.h)0
-rw-r--r--arch/x86/include/asm/seccomp_64.h (renamed from include/asm-x86/seccomp_64.h)0
-rw-r--r--arch/x86/include/asm/sections.h (renamed from include/asm-x86/sections.h)0
-rw-r--r--arch/x86/include/asm/segment.h (renamed from include/asm-x86/segment.h)0
-rw-r--r--arch/x86/include/asm/sembuf.h (renamed from include/asm-x86/sembuf.h)0
-rw-r--r--arch/x86/include/asm/serial.h (renamed from include/asm-x86/serial.h)0
-rw-r--r--arch/x86/include/asm/setup.h (renamed from include/asm-x86/setup.h)0
-rw-r--r--arch/x86/include/asm/shmbuf.h (renamed from include/asm-x86/shmbuf.h)0
-rw-r--r--arch/x86/include/asm/shmparam.h (renamed from include/asm-x86/shmparam.h)0
-rw-r--r--arch/x86/include/asm/sigcontext.h (renamed from include/asm-x86/sigcontext.h)0
-rw-r--r--arch/x86/include/asm/sigcontext32.h (renamed from include/asm-x86/sigcontext32.h)0
-rw-r--r--arch/x86/include/asm/siginfo.h (renamed from include/asm-x86/siginfo.h)0
-rw-r--r--arch/x86/include/asm/signal.h (renamed from include/asm-x86/signal.h)0
-rw-r--r--arch/x86/include/asm/smp.h (renamed from include/asm-x86/smp.h)0
-rw-r--r--arch/x86/include/asm/socket.h (renamed from include/asm-x86/socket.h)0
-rw-r--r--arch/x86/include/asm/sockios.h (renamed from include/asm-x86/sockios.h)0
-rw-r--r--arch/x86/include/asm/sparsemem.h (renamed from include/asm-x86/sparsemem.h)0
-rw-r--r--arch/x86/include/asm/spinlock.h (renamed from include/asm-x86/spinlock.h)0
-rw-r--r--arch/x86/include/asm/spinlock_types.h (renamed from include/asm-x86/spinlock_types.h)0
-rw-r--r--arch/x86/include/asm/srat.h (renamed from include/asm-x86/srat.h)0
-rw-r--r--arch/x86/include/asm/stacktrace.h (renamed from include/asm-x86/stacktrace.h)0
-rw-r--r--arch/x86/include/asm/stat.h (renamed from include/asm-x86/stat.h)0
-rw-r--r--arch/x86/include/asm/statfs.h (renamed from include/asm-x86/statfs.h)0
-rw-r--r--arch/x86/include/asm/string.h (renamed from include/asm-x86/string.h)0
-rw-r--r--arch/x86/include/asm/string_32.h (renamed from include/asm-x86/string_32.h)0
-rw-r--r--arch/x86/include/asm/string_64.h (renamed from include/asm-x86/string_64.h)0
-rw-r--r--arch/x86/include/asm/summit/apic.h (renamed from include/asm-x86/summit/apic.h)0
-rw-r--r--arch/x86/include/asm/summit/apicdef.h (renamed from include/asm-x86/summit/apicdef.h)0
-rw-r--r--arch/x86/include/asm/summit/ipi.h (renamed from include/asm-x86/summit/ipi.h)0
-rw-r--r--arch/x86/include/asm/summit/mpparse.h (renamed from include/asm-x86/summit/mpparse.h)0
-rw-r--r--arch/x86/include/asm/suspend.h (renamed from include/asm-x86/suspend.h)0
-rw-r--r--arch/x86/include/asm/suspend_32.h (renamed from include/asm-x86/suspend_32.h)0
-rw-r--r--arch/x86/include/asm/suspend_64.h (renamed from include/asm-x86/suspend_64.h)0
-rw-r--r--arch/x86/include/asm/swiotlb.h (renamed from include/asm-x86/swiotlb.h)0
-rw-r--r--arch/x86/include/asm/sync_bitops.h (renamed from include/asm-x86/sync_bitops.h)0
-rw-r--r--arch/x86/include/asm/syscall.h (renamed from include/asm-x86/syscall.h)0
-rw-r--r--arch/x86/include/asm/syscalls.h (renamed from include/asm-x86/syscalls.h)0
-rw-r--r--arch/x86/include/asm/system.h (renamed from include/asm-x86/system.h)0
-rw-r--r--arch/x86/include/asm/system_64.h (renamed from include/asm-x86/system_64.h)0
-rw-r--r--arch/x86/include/asm/tce.h (renamed from include/asm-x86/tce.h)0
-rw-r--r--arch/x86/include/asm/termbits.h (renamed from include/asm-x86/termbits.h)0
-rw-r--r--arch/x86/include/asm/termios.h (renamed from include/asm-x86/termios.h)0
-rw-r--r--arch/x86/include/asm/therm_throt.h (renamed from include/asm-x86/therm_throt.h)0
-rw-r--r--arch/x86/include/asm/thread_info.h (renamed from include/asm-x86/thread_info.h)0
-rw-r--r--arch/x86/include/asm/time.h (renamed from include/asm-x86/time.h)0
-rw-r--r--arch/x86/include/asm/timer.h (renamed from include/asm-x86/timer.h)0
-rw-r--r--arch/x86/include/asm/timex.h (renamed from include/asm-x86/timex.h)0
-rw-r--r--arch/x86/include/asm/tlb.h (renamed from include/asm-x86/tlb.h)0
-rw-r--r--arch/x86/include/asm/tlbflush.h (renamed from include/asm-x86/tlbflush.h)0
-rw-r--r--arch/x86/include/asm/topology.h (renamed from include/asm-x86/topology.h)0
-rw-r--r--arch/x86/include/asm/trampoline.h (renamed from include/asm-x86/trampoline.h)0
-rw-r--r--arch/x86/include/asm/traps.h (renamed from include/asm-x86/traps.h)0
-rw-r--r--arch/x86/include/asm/tsc.h (renamed from include/asm-x86/tsc.h)0
-rw-r--r--arch/x86/include/asm/types.h (renamed from include/asm-x86/types.h)0
-rw-r--r--arch/x86/include/asm/uaccess.h (renamed from include/asm-x86/uaccess.h)0
-rw-r--r--arch/x86/include/asm/uaccess_32.h (renamed from include/asm-x86/uaccess_32.h)0
-rw-r--r--arch/x86/include/asm/uaccess_64.h (renamed from include/asm-x86/uaccess_64.h)0
-rw-r--r--arch/x86/include/asm/ucontext.h (renamed from include/asm-x86/ucontext.h)0
-rw-r--r--arch/x86/include/asm/unaligned.h (renamed from include/asm-x86/unaligned.h)0
-rw-r--r--arch/x86/include/asm/unistd.h (renamed from include/asm-x86/unistd.h)0
-rw-r--r--arch/x86/include/asm/unistd_32.h (renamed from include/asm-x86/unistd_32.h)0
-rw-r--r--arch/x86/include/asm/unistd_64.h (renamed from include/asm-x86/unistd_64.h)0
-rw-r--r--arch/x86/include/asm/unwind.h (renamed from include/asm-x86/unwind.h)0
-rw-r--r--arch/x86/include/asm/user.h (renamed from include/asm-x86/user.h)0
-rw-r--r--arch/x86/include/asm/user32.h (renamed from include/asm-x86/user32.h)0
-rw-r--r--arch/x86/include/asm/user_32.h (renamed from include/asm-x86/user_32.h)0
-rw-r--r--arch/x86/include/asm/user_64.h (renamed from include/asm-x86/user_64.h)0
-rw-r--r--arch/x86/include/asm/uv/bios.h (renamed from include/asm-x86/uv/bios.h)0
-rw-r--r--arch/x86/include/asm/uv/uv_bau.h (renamed from include/asm-x86/uv/uv_bau.h)0
-rw-r--r--arch/x86/include/asm/uv/uv_hub.h (renamed from include/asm-x86/uv/uv_hub.h)0
-rw-r--r--arch/x86/include/asm/uv/uv_irq.h (renamed from include/asm-x86/uv/uv_irq.h)0
-rw-r--r--arch/x86/include/asm/uv/uv_mmrs.h (renamed from include/asm-x86/uv/uv_mmrs.h)0
-rw-r--r--arch/x86/include/asm/vdso.h (renamed from include/asm-x86/vdso.h)0
-rw-r--r--arch/x86/include/asm/vga.h (renamed from include/asm-x86/vga.h)0
-rw-r--r--arch/x86/include/asm/vgtod.h (renamed from include/asm-x86/vgtod.h)0
-rw-r--r--arch/x86/include/asm/vic.h (renamed from include/asm-x86/vic.h)0
-rw-r--r--arch/x86/include/asm/visws/cobalt.h (renamed from include/asm-x86/visws/cobalt.h)0
-rw-r--r--arch/x86/include/asm/visws/lithium.h (renamed from include/asm-x86/visws/lithium.h)0
-rw-r--r--arch/x86/include/asm/visws/piix4.h (renamed from include/asm-x86/visws/piix4.h)0
-rw-r--r--arch/x86/include/asm/visws/sgivw.h (renamed from include/asm-x86/visws/sgivw.h)0
-rw-r--r--arch/x86/include/asm/vm86.h (renamed from include/asm-x86/vm86.h)0
-rw-r--r--arch/x86/include/asm/vmi.h (renamed from include/asm-x86/vmi.h)0
-rw-r--r--arch/x86/include/asm/vmi_time.h (renamed from include/asm-x86/vmi_time.h)0
-rw-r--r--arch/x86/include/asm/voyager.h (renamed from include/asm-x86/voyager.h)0
-rw-r--r--arch/x86/include/asm/vsyscall.h (renamed from include/asm-x86/vsyscall.h)0
-rw-r--r--arch/x86/include/asm/xcr.h (renamed from include/asm-x86/xcr.h)0
-rw-r--r--arch/x86/include/asm/xen/events.h (renamed from include/asm-x86/xen/events.h)0
-rw-r--r--arch/x86/include/asm/xen/grant_table.h (renamed from include/asm-x86/xen/grant_table.h)0
-rw-r--r--arch/x86/include/asm/xen/hypercall.h (renamed from include/asm-x86/xen/hypercall.h)0
-rw-r--r--arch/x86/include/asm/xen/hypervisor.h (renamed from include/asm-x86/xen/hypervisor.h)0
-rw-r--r--arch/x86/include/asm/xen/interface.h (renamed from include/asm-x86/xen/interface.h)0
-rw-r--r--arch/x86/include/asm/xen/interface_32.h (renamed from include/asm-x86/xen/interface_32.h)0
-rw-r--r--arch/x86/include/asm/xen/interface_64.h (renamed from include/asm-x86/xen/interface_64.h)0
-rw-r--r--arch/x86/include/asm/xen/page.h (renamed from include/asm-x86/xen/page.h)0
-rw-r--r--arch/x86/include/asm/xor.h (renamed from include/asm-x86/xor.h)0
-rw-r--r--arch/x86/include/asm/xor_32.h (renamed from include/asm-x86/xor_32.h)0
-rw-r--r--arch/x86/include/asm/xor_64.h (renamed from include/asm-x86/xor_64.h)0
-rw-r--r--arch/x86/include/asm/xsave.h (renamed from include/asm-x86/xsave.h)0
-rw-r--r--arch/x86/kernel/cpu/Makefile2
-rw-r--r--drivers/xen/cpu_hotplug.c2
-rwxr-xr-xscripts/checksyscalls.sh2
340 files changed, 11 insertions, 11 deletions
diff --git a/arch/ia64/ia32/audit.c b/arch/ia64/ia32/audit.c
index 5e901c75df1..5c93ddd1e42 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 94fb24ea5af..4fc79f3030e 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 32f5fbe2d0d..ef42ec01eaf 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 f5631da585b..d1a47adb5ae 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 4a8e80cdcfa..4a8e80cdcfa 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 f5705761a37..f5705761a37 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 0948748bc69..0948748bc69 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 392e17336be..392e17336be 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 3617fd4fcdf..3617fd4fcdf 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 e2077d343c3..e2077d343c3 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 22d3c9862bf..22d3c9862bf 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 041d0db7da2..041d0db7da2 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 b3085869a17..b3085869a17 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 ef1d72dbdfe..ef1d72dbdfe 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 b922c85ac91..b922c85ac91 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 de4596b24c2..de4596b24c2 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 e1355f44d7c..e1355f44d7c 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 4e1b8873c47..4e1b8873c47 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 14d3f0beb88..14d3f0beb88 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 2cb218c4a35..2cb218c4a35 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 12c7cac7420..12c7cac7420 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 1d9543b9d35..1d9543b9d35 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 392c3f5ef2f..392c3f5ef2f 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 9404c535b7e..9404c535b7e 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 79b4b88505d..79b4b88505d 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 451a74762bd..451a74762bd 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 1d63bd5d594..1d63bd5d594 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 ccf027e2d97..ccf027e2d97 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 91ad43a54c4..91ad43a54c4 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 dc604985f2a..dc604985f2a 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 722f27d6810..722f27d6810 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 ea3f1cc06a9..ea3f1cc06a9 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 68840ef1b35..68840ef1b35 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 933fd272f82..933fd272f82 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 2bc162e0ec6..2bc162e0ec6 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 848850fd7d6..848850fd7d6 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 d041e8cda22..d041e8cda22 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 110f403beb8..110f403beb8 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 a460fa088d4..a460fa088d4 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 0622e45cdf7..0622e45cdf7 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 63c1a5e61b9..63c1a5e61b9 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 6732b150949..6732b150949 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 83a115083f0..83a115083f0 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 adfeae6586e..adfeae6586e 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 6d68ad7e0ea..6d68ad7e0ea 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 a863ead856f..a863ead856f 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 ecb6907c3ea..ecb6907c3ea 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 8a0da95b4fc..8a0da95b4fc 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 f06adac7938..f06adac7938 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 b881db664b4..b881db664b4 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 1bece04c7d9..1bece04c7d9 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 f9530f23f1d..f9530f23f1d 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 219c33d6361..219c33d6361 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 c9f7a4eec55..c9f7a4eec55 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 1cff6fe81fa..1cff6fe81fa 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 c3c953a45b2..c3c953a45b2 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 21d1bc32ad7..21d1bc32ad7 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 5abbdec06bd..5abbdec06bd 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 9493c5b27bb..9493c5b27bb 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 313438e6334..313438e6334 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 26bc15f01e7..26bc15f01e7 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 190d0d8b71e..190d0d8b71e 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 4c82b503d92..4c82b503d92 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 380f0b4f17e..380f0b4f17e 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 8b234a3cb85..8b234a3cb85 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 632a955fcc0..632a955fcc0 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 ed5a3caae14..ed5a3caae14 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 3ffc5a7bf66..3ffc5a7bf66 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 aca38dbd9a6..aca38dbd9a6 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 46ab12db573..46ab12db573 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 78e33a1bc59..78e33a1bc59 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 8844002da0e..8844002da0e 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 dab4751d130..dab4751d130 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 7d83a3a83e3..7d83a3a83e3 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 06850a7194e..06850a7194e 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 1bb6f9bbe1a..1bb6f9bbe1a 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 06b924ef6fa..06b924ef6fa 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 605edb39ef9..605edb39ef9 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 d48bee663a6..d48bee663a6 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 6fe4f81bfcf..6fe4f81bfcf 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 ed6a4886c08..ed6a4886c08 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 3f3444be263..3f3444be263 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 497fb980d96..497fb980d96 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 000787df66e..000787df66e 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 700fe230d91..700fe230d91 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 f8bd2919a8c..f8bd2919a8c 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 bc3f6a28031..bc3f6a28031 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 58b273f6ef0..58b273f6ef0 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 0b7ec5dc088..0b7ec5dc088 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 749d042f055..749d042f055 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 cc011a3bc1c..cc011a3bc1c 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 9ba862a4eac..9ba862a4eac 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 15a5b530044..15a5b530044 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 23c1b3baaec..23c1b3baaec 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 f932f7ad51d..f932f7ad51d 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 dbd887d8a5a..dbd887d8a5a 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 baa3f783d27..baa3f783d27 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 07c03c6c9a1..07c03c6c9a1 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 a233f835e0b..a233f835e0b 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 4f7d878bda1..4f7d878bda1 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 ee6e086b7df..ee6e086b7df 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 d35cbd7aa58..d35cbd7aa58 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 b279fe06dfe..b279fe06dfe 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 06752a64904..06752a64904 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 961e746da97..961e746da97 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 910304fbdc8..910304fbdc8 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 30a692cfaff..30a692cfaff 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 1e5f2909c1d..1e5f2909c1d 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 89c898ab298..89c898ab298 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 316a3b25887..316a3b25887 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 3dd9c0b7027..3dd9c0b7027 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 78242c6ffa5..78242c6ffa5 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 a8d065d85f5..a8d065d85f5 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 2bdab21f089..2bdab21f089 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 35a2fe9bc92..35a2fe9bc92 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 2bbaf4370a5..2bbaf4370a5 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 fbbab66ee9d..fbbab66ee9d 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 ea09600d612..ea09600d612 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 d283863354d..d283863354d 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 89f44493e64..89f44493e64 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 8a0748d0103..8a0748d0103 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 ba0dd791fad..ba0dd791fad 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 411fb8cfb24..411fb8cfb24 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 30054fded4f..30054fded4f 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 e2d9b030c1a..e2d9b030c1a 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 a5228504d86..a5228504d86 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 7505e947ed2..7505e947ed2 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 8f034ba4b53..8f034ba4b53 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 42d8b62ee8a..42d8b62ee8a 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 ae91994fd6c..ae91994fd6c 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 2aa61b54fbd..2aa61b54fbd 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 23ecda0b28a..23ecda0b28a 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 6b1add8e31d..6b1add8e31d 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 3c66f2cdaec..3c66f2cdaec 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 0c2d41c41b2..0c2d41c41b2 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 674bc7e50c3..674bc7e50c3 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 9c381f2815a..9c381f2815a 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 d77646f011f..d77646f011f 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 990b1583383..990b1583383 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 ff8778f26b8..ff8778f26b8 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 361b810f516..361b810f516 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 ed0bab42735..ed0bab42735 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 38846208b54..38846208b54 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 dbab36d64d4..dbab36d64d4 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 6ce0f7786ef..6ce0f7786ef 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 5085b52da30..5085b52da30 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 1657f38b8f2..1657f38b8f2 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 f67433dbd65..f67433dbd65 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 3115564e557..3115564e557 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 6061b153613..6061b153613 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 94b6cdf532e..94b6cdf532e 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 c8e9c8bed3d..c8e9c8bed3d 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 9e5a459fd15..9e5a459fd15 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 ae52624b593..ae52624b593 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 71729ca05cd..71729ca05cd 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 5768d8e95c8..5768d8e95c8 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 a995f33176c..a995f33176c 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 60d1ed287b1..60d1ed287b1 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 49f22be237d..49f22be237d 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 036133eaf74..036133eaf74 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 62c793bb70c..62c793bb70c 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 4ef28e6de38..4ef28e6de38 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 fb79b1cf5d0..fb79b1cf5d0 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 9d5aff14334..9d5aff14334 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 8ec940bfd07..8ec940bfd07 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 cce6f6e4afd..cce6f6e4afd 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 26758673c82..26758673c82 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 2e7299bb365..2e7299bb365 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 64217ea16a3..64217ea16a3 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 121b65d61d8..121b65d61d8 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 6480f3333b2..6480f3333b2 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 864f2005fc1..864f2005fc1 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 be2241a818f..be2241a818f 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 79166b04801..79166b04801 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 1b538c907a3..1b538c907a3 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 ed919024687..ed919024687 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 dabd10f0bbe..dabd10f0bbe 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 530af1f6389..530af1f6389 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 23a7f83da95..23a7f83da95 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 a731b9c573a..a731b9c573a 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 25c16d8ba3c..25c16d8ba3c 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 918ba21ab9d..918ba21ab9d 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 a53f829a97c..a53f829a97c 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 ae742721ae7..ae742721ae7 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 27da400d313..27da400d313 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 44cb07855c5..44cb07855c5 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 15c990395b0..15c990395b0 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 124bf7d4b70..124bf7d4b70 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 0bf2a06b7a4..0bf2a06b7a4 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 e012a46cc22..e012a46cc22 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 935588d286c..935588d286c 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 252292e077b..252292e077b 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 c577bda5b1c..c577bda5b1c 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 d7328b1a05c..d7328b1a05c 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 d4f1d5791fc..d4f1d5791fc 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 bdf5dba4cfb..bdf5dba4cfb 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 49380b8c7e2..49380b8c7e2 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 0009cfb11a5..0009cfb11a5 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 8d6ae2f760d..8d6ae2f760d 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 2e3dda4dc3d..2e3dda4dc3d 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 482c3e3f987..482c3e3f987 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 da42be07b69..da42be07b69 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 60258319299..60258319299 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 3f2288207c0..3f2288207c0 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 f72e12d5770..f72e12d5770 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 80860afffbd..80860afffbd 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 e10a1d0678c..e10a1d0678c 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 3cd23adedae..3cd23adedae 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 7ec48f4e534..7ec48f4e534 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 81762081dcd..81762081dcd 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 c05fe6ff372..c05fe6ff372 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 75f4276b5dd..75f4276b5dd 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 88a53b1a17f..88a53b1a17f 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 8de702dc7d6..8de702dc7d6 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 fde9770e53d..fde9770e53d 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 c98509d3149..c98509d3149 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 bb7133dc155..bb7133dc155 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 70cf2bb0593..70cf2bb0593 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 388b4e7f4a4..388b4e7f4a4 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 e7ae34eb410..e7ae34eb410 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 1198f2a0e42..1198f2a0e42 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 dc5f0712f9f..dc5f0712f9f 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 ee7cbb30773..ee7cbb30773 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 6e89e8b4de0..6e89e8b4de0 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 4298b8882a7..4298b8882a7 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 a2025525a15..a2025525a15 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 edb3b4ecfc8..edb3b4ecfc8 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 ad29e277fd6..ad29e277fd6 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 1c2f0ce9e31..1c2f0ce9e31 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 2c2987d9757..2c2987d9757 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 a01c4e37633..a01c4e37633 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 04bc4db8921..04bc4db8921 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 e39376d7de5..e39376d7de5 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 5e1256bdee8..5e1256bdee8 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 f71c3b0ed36..f71c3b0ed36 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 48a3109e1a7..48a3109e1a7 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 3ff3015b71a..3ff3015b71a 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 ee48f880005..ee48f880005 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 c62e58a5a90..c62e58a5a90 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 cf9ab2dbcef..cf9ab2dbcef 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 03274cea751..03274cea751 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 2b8c5160388..2b8c5160388 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 5d6e6945489..5d6e6945489 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 81f06b7e5a3..81f06b7e5a3 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 303660b671e..303660b671e 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 11b6cc14b28..11b6cc14b28 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 f51aec2298e..f51aec2298e 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 a83a1fd96a0..a83a1fd96a0 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 ee813f4fe5d..ee813f4fe5d 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 8c347032c2f..8c347032c2f 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 808bdfb2958..808bdfb2958 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 65acc82d267..65acc82d267 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 a6afc29f2dd..a6afc29f2dd 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 db73274c83c..db73274c83c 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 a006704fdc8..a006704fdc8 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 38f8e6bc318..38f8e6bc318 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 157ff7fab97..157ff7fab97 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 6aa9b562c50..6aa9b562c50 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 5363e4f7e1c..5363e4f7e1c 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 f43517e2853..f43517e2853 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 1e120f62890..1e120f62890 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 ca5dc19dd46..ca5dc19dd46 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 6dfd6d9373a..6dfd6d9373a 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 487843ed245..487843ed245 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 a2add11d3b6..a2add11d3b6 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 9b3070f1c2a..9b3070f1c2a 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 f3fbca1f61c..f3fbca1f61c 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 53bd1e7bd7b..53bd1e7bd7b 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 013ce6fab2d..013ce6fab2d 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 9bd521fe457..9bd521fe457 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 acb6d4d491f..acb6d4d491f 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 cf821dd310e..cf821dd310e 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 1e20adbcad4..1e20adbcad4 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 b689bee7110..b689bee7110 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 04c47dc5597..04c47dc5597 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 87803da4401..87803da4401 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 b20c894660f..b20c894660f 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 5aedb8bffc5..5aedb8bffc5 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 e7932d7fbba..e7932d7fbba 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 3d00dc5e0c7..3d00dc5e0c7 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 e235db24807..e235db24807 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 1c7f57b6b66..1c7f57b6b66 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 3f4e52bb77f..3f4e52bb77f 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 3e724eef7ac..3e724eef7ac 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 d0babce4b47..d0babce4b47 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 d1ce2416a5d..d1ce2416a5d 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 db36e9e89e8..db36e9e89e8 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 3cdd08b5bdb..3cdd08b5bdb 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 7eca9bc022b..7eca9bc022b 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 0406bbd898a..0406bbd898a 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 6c3dc2c6575..6c3dc2c6575 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 ad0f5c41e78..ad0f5c41e78 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 e78b52e1744..e78b52e1744 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 48ebc0ad40e..48ebc0ad40e 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 6b5b57d9c6d..6b5b57d9c6d 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 c96c1f5d07a..c96c1f5d07a 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 89eaa5456a7..89eaa5456a7 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 59dcdec3716..59dcdec3716 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 2a58ed3e51d..2a58ed3e51d 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 017f4a87c91..017f4a87c91 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 ace83f1f678..ace83f1f678 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 a2151567db4..a2151567db4 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 999873b22e7..999873b22e7 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 aa66c1857f0..aa66c1857f0 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 e0fe2f55f1a..e0fe2f55f1a 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 38b5799863b..38b5799863b 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 215f1969c26..215f1969c26 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 77153fb18f5..77153fb18f5 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 bdb5b01afbf..bdb5b01afbf 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 8bf5f32da9c..8bf5f32da9c 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 8b03d89d245..8b03d89d245 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 4ab320913ea..4ab320913ea 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 b9e493d07d0..b9e493d07d0 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 38fd1336402..38fd1336402 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 53100f35361..53100f35361 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 9627a8fe84e..9627a8fe84e 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 b36d3b378c6..b36d3b378c6 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 61c938045ec..61c938045ec 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 5fbf63e1003..5fbf63e1003 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 998bd18eb73..998bd18eb73 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 b7c0dea119f..b7c0dea119f 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 b2d39e6a08b..b2d39e6a08b 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 9c811d2e6f9..9c811d2e6f9 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 dcd4682413d..dcd4682413d 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 f2cba4e79a2..f2cba4e79a2 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 8151f5b8b6c..8151f5b8b6c 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 c4baab4d2b6..c4baab4d2b6 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 44f4259bee3..44f4259bee3 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 445a2475956..445a2475956 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 d077bba96da..d077bba96da 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 08167e19fc6..08167e19fc6 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 046c0f1e01d..046c0f1e01d 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 d5eada0a48d..d5eada0a48d 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 11b3bb86e17..11b3bb86e17 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 921b4584044..921b4584044 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 2d3a18de295..2d3a18de295 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 08e9a1ac07a..08e9a1ac07a 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 7f0b45a5d78..82ec6075c05 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 565280ec1c6..974f56d1ebe 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 366f8c7f62b..41564b142c0 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