From 96a388de5dc53a8b234b3fd41f3ae2cedc9ffd42 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 11 Oct 2007 11:20:03 +0200
Subject: [PATCH] i386/x86_64: move headers to include/asm-x86
Move the headers to include/asm-x86 and fixup the
header install make rules
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
---
Documentation/lguest/lguest.c | 2 +-
Kbuild | 2 +-
Makefile | 17 ++--
arch/i386/Makefile | 16 ++--
arch/ia64/ia32/audit.c | 2 +-
arch/um/sys-x86_64/syscall_table.c | 4 +-
arch/x86/ia32/audit.c | 2 +-
arch/x86/ia32/ipc32.c | 2 +-
arch/x86/kernel/cpu/mtrr/state.c | 2 +-
arch/x86/kernel/syscall_64.c | 4 +-
include/asm-i386/Kbuild | 12 ---
include/asm-i386/k8.h | 1 -
include/asm-i386/pci-direct.h | 1 -
include/asm-i386/stacktrace.h | 1 -
include/asm-sh/mpc1211/mc146818rtc.h | 2 +-
include/asm-x86/8253pit.h | 5 ++
.../8253pit.h => asm-x86/8253pit_32.h} | 0
.../8253pit.h => asm-x86/8253pit_64.h} | 0
include/asm-x86/Kbuild | 88 +++++++++++++++++++
include/asm-x86/a.out.h | 13 +++
.../{asm-i386/a.out.h => asm-x86/a.out_32.h} | 0
.../a.out.h => asm-x86/a.out_64.h} | 0
include/asm-x86/acpi.h | 5 ++
.../{asm-i386/acpi.h => asm-x86/acpi_32.h} | 0
.../{asm-x86_64/acpi.h => asm-x86/acpi_64.h} | 0
include/asm-x86/agp.h | 5 ++
include/{asm-i386/agp.h => asm-x86/agp_32.h} | 0
.../{asm-x86_64/agp.h => asm-x86/agp_64.h} | 0
include/asm-x86/alternative-asm.i | 5 ++
.../alternative-asm_32.i} | 0
.../alternative-asm_64.i} | 0
include/asm-x86/alternative.h | 5 ++
.../alternative_32.h} | 0
.../alternative_64.h} | 0
include/asm-x86/apic.h | 5 ++
.../{asm-i386/apic.h => asm-x86/apic_32.h} | 0
.../{asm-x86_64/apic.h => asm-x86/apic_64.h} | 0
include/asm-x86/apicdef.h | 5 ++
.../apicdef.h => asm-x86/apicdef_32.h} | 0
.../apicdef.h => asm-x86/apicdef_64.h} | 0
include/{asm-i386 => asm-x86}/arch_hooks.h | 0
include/asm-x86/atomic.h | 5 ++
.../atomic.h => asm-x86/atomic_32.h} | 0
.../atomic.h => asm-x86/atomic_64.h} | 0
include/asm-x86/auxvec.h | 13 +++
.../auxvec.h => asm-x86/auxvec_32.h} | 0
.../auxvec.h => asm-x86/auxvec_64.h} | 0
include/asm-x86/bitops.h | 5 ++
.../bitops.h => asm-x86/bitops_32.h} | 0
.../bitops.h => asm-x86/bitops_64.h} | 0
include/{asm-i386 => asm-x86}/boot.h | 0
include/{asm-i386 => asm-x86}/bootparam.h | 0
include/{asm-x86_64 => asm-x86}/bootsetup.h | 0
include/asm-x86/bug.h | 5 ++
include/{asm-i386/bug.h => asm-x86/bug_32.h} | 0
.../{asm-x86_64/bug.h => asm-x86/bug_64.h} | 0
include/asm-x86/bugs.h | 5 ++
.../{asm-i386/bugs.h => asm-x86/bugs_32.h} | 0
.../{asm-x86_64/bugs.h => asm-x86/bugs_64.h} | 0
include/asm-x86/byteorder.h | 13 +++
.../byteorder.h => asm-x86/byteorder_32.h} | 0
.../byteorder.h => asm-x86/byteorder_64.h} | 0
include/asm-x86/cache.h | 5 ++
.../{asm-i386/cache.h => asm-x86/cache_32.h} | 0
.../cache.h => asm-x86/cache_64.h} | 0
include/asm-x86/cacheflush.h | 5 ++
.../cacheflush.h => asm-x86/cacheflush_32.h} | 0
.../cacheflush.h => asm-x86/cacheflush_64.h} | 0
include/{asm-x86_64 => asm-x86}/calgary.h | 0
include/{asm-x86_64 => asm-x86}/calling.h | 0
include/asm-x86/checksum.h | 5 ++
.../checksum.h => asm-x86/checksum_32.h} | 0
.../checksum.h => asm-x86/checksum_64.h} | 0
include/asm-x86/cmpxchg.h | 5 ++
.../cmpxchg.h => asm-x86/cmpxchg_32.h} | 0
.../cmpxchg.h => asm-x86/cmpxchg_64.h} | 0
include/{asm-x86_64 => asm-x86}/compat.h | 0
include/{asm-i386 => asm-x86}/cpu.h | 0
include/asm-x86/cpufeature.h | 5 ++
.../cpufeature.h => asm-x86/cpufeature_32.h} | 0
.../cpufeature.h => asm-x86/cpufeature_64.h} | 4 +-
include/asm-x86/cputime.h | 5 ++
.../cputime.h => asm-x86/cputime_32.h} | 0
.../cputime.h => asm-x86/cputime_64.h} | 0
include/asm-x86/current.h | 5 ++
.../current.h => asm-x86/current_32.h} | 0
.../current.h => asm-x86/current_64.h} | 0
include/asm-x86/debugreg.h | 13 +++
.../debugreg.h => asm-x86/debugreg_32.h} | 0
.../debugreg.h => asm-x86/debugreg_64.h} | 0
include/asm-x86/delay.h | 5 ++
.../{asm-i386/delay.h => asm-x86/delay_32.h} | 0
.../delay.h => asm-x86/delay_64.h} | 0
include/asm-x86/desc.h | 5 ++
.../{asm-i386/desc.h => asm-x86/desc_32.h} | 0
.../{asm-x86_64/desc.h => asm-x86/desc_64.h} | 0
include/{asm-x86_64 => asm-x86}/desc_defs.h | 0
include/asm-x86/device.h | 5 ++
.../device.h => asm-x86/device_32.h} | 0
.../device.h => asm-x86/device_64.h} | 0
include/asm-x86/div64.h | 5 ++
.../{asm-i386/div64.h => asm-x86/div64_32.h} | 0
.../div64.h => asm-x86/div64_64.h} | 0
include/asm-x86/dma-mapping.h | 5 ++
.../dma-mapping_32.h} | 0
.../dma-mapping_64.h} | 0
include/asm-x86/dma.h | 5 ++
include/{asm-i386/dma.h => asm-x86/dma_32.h} | 0
.../{asm-x86_64/dma.h => asm-x86/dma_64.h} | 0
include/asm-x86/dmi.h | 5 ++
include/{asm-i386/dmi.h => asm-x86/dmi_32.h} | 0
.../{asm-x86_64/dmi.h => asm-x86/dmi_64.h} | 0
include/asm-x86/dwarf2.h | 5 ++
.../dwarf2.h => asm-x86/dwarf2_32.h} | 0
.../dwarf2.h => asm-x86/dwarf2_64.h} | 0
include/asm-x86/e820.h | 5 ++
.../{asm-i386/e820.h => asm-x86/e820_32.h} | 0
.../{asm-x86_64/e820.h => asm-x86/e820_64.h} | 0
include/asm-x86/edac.h | 5 ++
.../{asm-i386/edac.h => asm-x86/edac_32.h} | 0
.../{asm-x86_64/edac.h => asm-x86/edac_64.h} | 0
include/asm-x86/elf.h | 13 +++
include/{asm-i386/elf.h => asm-x86/elf_32.h} | 0
.../{asm-x86_64/elf.h => asm-x86/elf_64.h} | 0
.../{asm-i386 => asm-x86}/emergency-restart.h | 0
include/asm-x86/errno.h | 13 +++
.../{asm-i386/errno.h => asm-x86/errno_32.h} | 0
.../errno.h => asm-x86/errno_64.h} | 0
include/asm-x86/fb.h | 5 ++
include/{asm-i386/fb.h => asm-x86/fb_32.h} | 0
include/{asm-x86_64/fb.h => asm-x86/fb_64.h} | 0
include/{asm-i386 => asm-x86}/fcntl.h | 0
include/asm-x86/fixmap.h | 5 ++
.../fixmap.h => asm-x86/fixmap_32.h} | 0
.../fixmap.h => asm-x86/fixmap_64.h} | 0
include/asm-x86/floppy.h | 5 ++
.../floppy.h => asm-x86/floppy_32.h} | 0
.../floppy.h => asm-x86/floppy_64.h} | 0
include/{asm-x86_64 => asm-x86}/fpu32.h | 0
include/{asm-i386 => asm-x86}/frame.i | 0
include/asm-x86/futex.h | 5 ++
.../{asm-i386/futex.h => asm-x86/futex_32.h} | 0
.../futex.h => asm-x86/futex_64.h} | 0
include/asm-x86/genapic.h | 5 ++
.../genapic.h => asm-x86/genapic_32.h} | 0
.../genapic.h => asm-x86/genapic_64.h} | 0
include/{asm-i386 => asm-x86}/geode.h | 0
include/asm-x86/hardirq.h | 5 ++
.../hardirq.h => asm-x86/hardirq_32.h} | 0
.../hardirq.h => asm-x86/hardirq_64.h} | 0
include/{asm-i386 => asm-x86}/highmem.h | 0
include/asm-x86/hpet.h | 5 ++
.../{asm-i386/hpet.h => asm-x86/hpet_32.h} | 0
.../{asm-x86_64/hpet.h => asm-x86/hpet_64.h} | 2 +-
include/asm-x86/hw_irq.h | 5 ++
.../hw_irq.h => asm-x86/hw_irq_32.h} | 0
.../hw_irq.h => asm-x86/hw_irq_64.h} | 0
.../{asm-i386 => asm-x86}/hypertransport.h | 0
include/asm-x86/i387.h | 5 ++
.../{asm-i386/i387.h => asm-x86/i387_32.h} | 0
.../{asm-x86_64/i387.h => asm-x86/i387_64.h} | 0
include/asm-x86/i8253.h | 5 ++
.../{asm-i386/i8253.h => asm-x86/i8253_32.h} | 0
.../i8253.h => asm-x86/i8253_64.h} | 0
include/{asm-i386 => asm-x86}/i8259.h | 0
include/{asm-x86_64 => asm-x86}/ia32.h | 0
include/{asm-x86_64 => asm-x86}/ia32_unistd.h | 0
include/{asm-i386 => asm-x86}/ide.h | 0
include/{asm-x86_64 => asm-x86}/idle.h | 0
include/asm-x86/intel_arch_perfmon.h | 5 ++
.../intel_arch_perfmon_32.h} | 0
.../intel_arch_perfmon_64.h} | 0
include/asm-x86/io.h | 5 ++
include/{asm-i386/io.h => asm-x86/io_32.h} | 0
include/{asm-x86_64/io.h => asm-x86/io_64.h} | 0
include/asm-x86/io_apic.h | 5 ++
.../io_apic.h => asm-x86/io_apic_32.h} | 0
.../io_apic.h => asm-x86/io_apic_64.h} | 0
include/{asm-i386 => asm-x86}/ioctl.h | 0
include/asm-x86/ioctls.h | 13 +++
.../ioctls.h => asm-x86/ioctls_32.h} | 0
.../ioctls.h => asm-x86/ioctls_64.h} | 0
include/{asm-x86_64 => asm-x86}/iommu.h | 0
include/{asm-i386 => asm-x86}/ipc.h | 0
include/asm-x86/ipcbuf.h | 13 +++
.../ipcbuf.h => asm-x86/ipcbuf_32.h} | 0
.../ipcbuf.h => asm-x86/ipcbuf_64.h} | 0
include/{asm-x86_64 => asm-x86}/ipi.h | 0
include/asm-x86/irq.h | 5 ++
include/{asm-i386/irq.h => asm-x86/irq_32.h} | 0
.../{asm-x86_64/irq.h => asm-x86/irq_64.h} | 0
include/asm-x86/irq_regs.h | 5 ++
.../irq_regs.h => asm-x86/irq_regs_32.h} | 0
.../irq_regs.h => asm-x86/irq_regs_64.h} | 0
include/asm-x86/irqflags.h | 5 ++
.../irqflags.h => asm-x86/irqflags_32.h} | 0
.../irqflags.h => asm-x86/irqflags_64.h} | 0
include/{asm-i386 => asm-x86}/ist.h | 0
include/{asm-x86_64 => asm-x86}/k8.h | 0
include/asm-x86/kdebug.h | 5 ++
.../kdebug.h => asm-x86/kdebug_32.h} | 0
.../kdebug.h => asm-x86/kdebug_64.h} | 0
include/asm-x86/kexec.h | 5 ++
.../{asm-i386/kexec.h => asm-x86/kexec_32.h} | 0
.../kexec.h => asm-x86/kexec_64.h} | 0
include/asm-x86/kmap_types.h | 5 ++
.../kmap_types.h => asm-x86/kmap_types_32.h} | 0
.../kmap_types.h => asm-x86/kmap_types_64.h} | 0
include/asm-x86/kprobes.h | 5 ++
.../kprobes.h => asm-x86/kprobes_32.h} | 0
.../kprobes.h => asm-x86/kprobes_64.h} | 0
include/asm-x86/ldt.h | 13 +++
include/{asm-i386/ldt.h => asm-x86/ldt_32.h} | 0
.../{asm-x86_64/ldt.h => asm-x86/ldt_64.h} | 0
include/asm-x86/linkage.h | 5 ++
.../linkage.h => asm-x86/linkage_32.h} | 0
.../linkage.h => asm-x86/linkage_64.h} | 0
include/asm-x86/local.h | 5 ++
.../{asm-i386/local.h => asm-x86/local_32.h} | 0
.../local.h => asm-x86/local_64.h} | 0
.../mach-bigsmp/mach_apic.h | 0
.../mach-bigsmp/mach_apicdef.h | 0
.../mach-bigsmp/mach_ipi.h | 0
.../mach-bigsmp/mach_mpspec.h | 0
.../{asm-i386 => asm-x86}/mach-default/apm.h | 0
.../mach-default/bios_ebda.h | 0
.../mach-default/do_timer.h | 0
.../mach-default/entry_arch.h | 0
.../mach-default/io_ports.h | 0
.../mach-default/irq_vectors.h | 0
.../mach-default/irq_vectors_limits.h | 0
.../mach-default/mach_apic.h | 0
.../mach-default/mach_apicdef.h | 0
.../mach-default/mach_ipi.h | 0
.../mach-default/mach_mpparse.h | 0
.../mach-default/mach_mpspec.h | 0
.../mach-default/mach_reboot.h | 0
.../mach-default/mach_time.h | 0
.../mach-default/mach_timer.h | 0
.../mach-default/mach_traps.h | 0
.../mach-default/mach_wakecpu.h | 0
.../mach-default/pci-functions.h | 0
.../mach-default/setup_arch.h | 0
.../mach-default/smpboot_hooks.h | 0
.../mach-es7000/mach_apic.h | 0
.../mach-es7000/mach_apicdef.h | 0
.../mach-es7000/mach_ipi.h | 0
.../mach-es7000/mach_mpparse.h | 0
.../mach-es7000/mach_mpspec.h | 0
.../mach-es7000/mach_wakecpu.h | 0
.../mach-generic/irq_vectors_limits.h | 0
.../mach-generic/mach_apic.h | 0
.../mach-generic/mach_apicdef.h | 0
.../mach-generic/mach_ipi.h | 0
.../mach-generic/mach_mpparse.h | 0
.../mach-generic/mach_mpspec.h | 0
.../mach-numaq/mach_apic.h | 0
.../mach-numaq/mach_apicdef.h | 0
.../mach-numaq/mach_ipi.h | 0
.../mach-numaq/mach_mpparse.h | 0
.../mach-numaq/mach_mpspec.h | 0
.../mach-numaq/mach_wakecpu.h | 0
.../mach-summit/irq_vectors_limits.h | 0
.../mach-summit/mach_apic.h | 0
.../mach-summit/mach_apicdef.h | 0
.../mach-summit/mach_ipi.h | 0
.../mach-summit/mach_mpparse.h | 0
.../mach-summit/mach_mpspec.h | 0
.../{asm-i386 => asm-x86}/mach-visws/cobalt.h | 0
.../mach-visws/entry_arch.h | 0
.../mach-visws/irq_vectors.h | 0
.../mach-visws/lithium.h | 0
.../mach-visws/mach_apic.h | 0
.../mach-visws/mach_apicdef.h | 0
.../{asm-i386 => asm-x86}/mach-visws/piix4.h | 0
.../mach-visws/setup_arch.h | 0
.../mach-visws/smpboot_hooks.h | 0
.../mach-voyager/do_timer.h | 0
.../mach-voyager/entry_arch.h | 0
.../mach-voyager/irq_vectors.h | 0
.../mach-voyager/setup_arch.h | 0
include/{asm-x86_64 => asm-x86}/mach_apic.h | 0
include/{asm-i386 => asm-x86}/math_emu.h | 0
include/asm-x86/mc146818rtc.h | 5 ++
.../mc146818rtc_32.h} | 0
.../mc146818rtc_64.h} | 0
include/{asm-i386 => asm-x86}/mca.h | 0
include/{asm-i386 => asm-x86}/mca_dma.h | 0
include/asm-x86/mce.h | 5 ++
include/{asm-i386/mce.h => asm-x86/mce_32.h} | 0
.../{asm-x86_64/mce.h => asm-x86/mce_64.h} | 0
include/asm-x86/mman.h | 13 +++
.../{asm-i386/mman.h => asm-x86/mman_32.h} | 0
.../{asm-x86_64/mman.h => asm-x86/mman_64.h} | 0
include/{asm-x86_64 => asm-x86}/mmsegment.h | 0
include/asm-x86/mmu.h | 5 ++
include/{asm-i386/mmu.h => asm-x86/mmu_32.h} | 0
.../{asm-x86_64/mmu.h => asm-x86/mmu_64.h} | 0
include/asm-x86/mmu_context.h | 5 ++
.../mmu_context_32.h} | 0
.../mmu_context_64.h} | 0
include/{asm-i386 => asm-x86}/mmx.h | 0
include/asm-x86/mmzone.h | 5 ++
.../mmzone.h => asm-x86/mmzone_32.h} | 0
.../mmzone.h => asm-x86/mmzone_64.h} | 0
include/asm-x86/module.h | 5 ++
.../module.h => asm-x86/module_32.h} | 0
.../module.h => asm-x86/module_64.h} | 0
include/asm-x86/mpspec.h | 5 ++
.../mpspec.h => asm-x86/mpspec_32.h} | 0
.../mpspec.h => asm-x86/mpspec_64.h} | 0
include/{asm-i386 => asm-x86}/mpspec_def.h | 0
include/asm-x86/msgbuf.h | 13 +++
.../msgbuf.h => asm-x86/msgbuf_32.h} | 0
.../msgbuf.h => asm-x86/msgbuf_64.h} | 0
include/{asm-i386 => asm-x86}/msidef.h | 0
include/{asm-i386 => asm-x86}/msr-index.h | 0
include/asm-x86/msr.h | 13 +++
include/{asm-i386/msr.h => asm-x86/msr_32.h} | 0
.../{asm-x86_64/msr.h => asm-x86/msr_64.h} | 0
include/asm-x86/mtrr.h | 13 +++
.../{asm-i386/mtrr.h => asm-x86/mtrr_32.h} | 0
.../{asm-x86_64/mtrr.h => asm-x86/mtrr_64.h} | 0
include/asm-x86/mutex.h | 5 ++
.../{asm-i386/mutex.h => asm-x86/mutex_32.h} | 0
.../mutex.h => asm-x86/mutex_64.h} | 0
include/asm-x86/namei.h | 5 ++
.../{asm-i386/namei.h => asm-x86/namei_32.h} | 0
.../namei.h => asm-x86/namei_64.h} | 0
include/asm-x86/nmi.h | 5 ++
include/{asm-i386/nmi.h => asm-x86/nmi_32.h} | 0
.../{asm-x86_64/nmi.h => asm-x86/nmi_64.h} | 0
include/asm-x86/numa.h | 5 ++
.../{asm-i386/numa.h => asm-x86/numa_32.h} | 0
.../{asm-x86_64/numa.h => asm-x86/numa_64.h} | 0
include/{asm-i386 => asm-x86}/numaq.h | 0
include/asm-x86/page.h | 13 +++
.../{asm-i386/page.h => asm-x86/page_32.h} | 0
.../{asm-x86_64/page.h => asm-x86/page_64.h} | 0
include/asm-x86/param.h | 13 +++
.../{asm-i386/param.h => asm-x86/param_32.h} | 0
.../param.h => asm-x86/param_64.h} | 0
include/{asm-i386 => asm-x86}/paravirt.h | 0
include/asm-x86/parport.h | 5 ++
.../parport.h => asm-x86/parport_32.h} | 0
.../parport.h => asm-x86/parport_64.h} | 0
include/{asm-x86_64 => asm-x86}/pci-direct.h | 0
include/asm-x86/pci.h | 5 ++
include/{asm-i386/pci.h => asm-x86/pci_32.h} | 0
.../{asm-x86_64/pci.h => asm-x86/pci_64.h} | 0
include/{asm-x86_64 => asm-x86}/pda.h | 0
include/asm-x86/percpu.h | 5 ++
.../percpu.h => asm-x86/percpu_32.h} | 0
.../percpu.h => asm-x86/percpu_64.h} | 0
include/asm-x86/pgalloc.h | 5 ++
.../pgalloc.h => asm-x86/pgalloc_32.h} | 0
.../pgalloc.h => asm-x86/pgalloc_64.h} | 0
.../pgtable-2level-defs.h | 0
.../{asm-i386 => asm-x86}/pgtable-2level.h | 0
.../pgtable-3level-defs.h | 0
.../{asm-i386 => asm-x86}/pgtable-3level.h | 0
include/asm-x86/pgtable.h | 5 ++
.../pgtable.h => asm-x86/pgtable_32.h} | 0
.../pgtable.h => asm-x86/pgtable_64.h} | 0
include/{asm-i386 => asm-x86}/poll.h | 0
include/asm-x86/posix_types.h | 13 +++
.../posix_types_32.h} | 0
.../posix_types_64.h} | 0
include/{asm-x86_64 => asm-x86}/prctl.h | 0
.../{asm-i386 => asm-x86}/processor-cyrix.h | 0
.../{asm-i386 => asm-x86}/processor-flags.h | 0
include/asm-x86/processor.h | 5 ++
.../processor.h => asm-x86/processor_32.h} | 0
.../processor.h => asm-x86/processor_64.h} | 0
include/{asm-x86_64 => asm-x86}/proto.h | 0
include/asm-x86/ptrace-abi.h | 13 +++
.../ptrace-abi.h => asm-x86/ptrace-abi_32.h} | 0
.../ptrace-abi.h => asm-x86/ptrace-abi_64.h} | 0
include/asm-x86/ptrace.h | 13 +++
.../ptrace.h => asm-x86/ptrace_32.h} | 0
.../ptrace.h => asm-x86/ptrace_64.h} | 0
include/{asm-i386 => asm-x86}/reboot.h | 0
include/{asm-i386 => asm-x86}/reboot_fixups.h | 0
include/asm-x86/required-features.h | 5 ++
.../required-features_32.h} | 0
.../required-features_64.h} | 0
include/asm-x86/resource.h | 13 +++
.../resource.h => asm-x86/resource_32.h} | 0
.../resource.h => asm-x86/resource_64.h} | 0
include/asm-x86/resume-trace.h | 5 ++
.../resume-trace_32.h} | 0
.../resume-trace_64.h} | 0
include/{asm-x86_64 => asm-x86}/rio.h | 0
include/asm-x86/rtc.h | 5 ++
include/{asm-i386/rtc.h => asm-x86/rtc_32.h} | 0
.../{asm-x86_64/rtc.h => asm-x86/rtc_64.h} | 0
include/asm-x86/rwlock.h | 5 ++
.../rwlock.h => asm-x86/rwlock_32.h} | 0
.../rwlock.h => asm-x86/rwlock_64.h} | 0
include/{asm-i386 => asm-x86}/rwsem.h | 0
include/asm-x86/scatterlist.h | 5 ++
.../scatterlist_32.h} | 0
.../scatterlist_64.h} | 0
include/asm-x86/seccomp.h | 5 ++
.../seccomp.h => asm-x86/seccomp_32.h} | 0
.../seccomp.h => asm-x86/seccomp_64.h} | 0
include/asm-x86/sections.h | 5 ++
.../sections.h => asm-x86/sections_32.h} | 0
.../sections.h => asm-x86/sections_64.h} | 0
include/asm-x86/segment.h | 5 ++
.../segment.h => asm-x86/segment_32.h} | 0
.../segment.h => asm-x86/segment_64.h} | 0
include/asm-x86/semaphore.h | 5 ++
.../semaphore.h => asm-x86/semaphore_32.h} | 0
.../semaphore.h => asm-x86/semaphore_64.h} | 0
include/asm-x86/sembuf.h | 13 +++
.../sembuf.h => asm-x86/sembuf_32.h} | 0
.../sembuf.h => asm-x86/sembuf_64.h} | 0
include/asm-x86/serial.h | 5 ++
.../serial.h => asm-x86/serial_32.h} | 0
.../serial.h => asm-x86/serial_64.h} | 0
include/asm-x86/setup.h | 13 +++
.../{asm-i386/setup.h => asm-x86/setup_32.h} | 0
.../setup.h => asm-x86/setup_64.h} | 0
include/asm-x86/shmbuf.h | 13 +++
.../shmbuf.h => asm-x86/shmbuf_32.h} | 0
.../shmbuf.h => asm-x86/shmbuf_64.h} | 0
include/asm-x86/shmparam.h | 13 +++
.../shmparam.h => asm-x86/shmparam_32.h} | 0
.../shmparam.h => asm-x86/shmparam_64.h} | 0
include/asm-x86/sigcontext.h | 13 +++
.../{asm-x86_64 => asm-x86}/sigcontext32.h | 0
.../sigcontext.h => asm-x86/sigcontext_32.h} | 0
.../sigcontext.h => asm-x86/sigcontext_64.h} | 0
include/asm-x86/siginfo.h | 13 +++
.../siginfo.h => asm-x86/siginfo_32.h} | 0
.../siginfo.h => asm-x86/siginfo_64.h} | 0
include/asm-x86/signal.h | 13 +++
.../signal.h => asm-x86/signal_32.h} | 0
.../signal.h => asm-x86/signal_64.h} | 0
include/asm-x86/smp.h | 5 ++
include/{asm-i386/smp.h => asm-x86/smp_32.h} | 0
.../{asm-x86_64/smp.h => asm-x86/smp_64.h} | 0
include/{asm-i386 => asm-x86}/socket.h | 0
include/asm-x86/sockios.h | 13 +++
.../sockios.h => asm-x86/sockios_32.h} | 0
.../sockios.h => asm-x86/sockios_64.h} | 0
include/asm-x86/sparsemem.h | 5 ++
.../sparsemem.h => asm-x86/sparsemem_32.h} | 0
.../sparsemem.h => asm-x86/sparsemem_64.h} | 0
include/asm-x86/spinlock.h | 5 ++
.../spinlock.h => asm-x86/spinlock_32.h} | 0
.../spinlock.h => asm-x86/spinlock_64.h} | 0
.../{asm-i386 => asm-x86}/spinlock_types.h | 0
include/{asm-i386 => asm-x86}/srat.h | 0
include/{asm-x86_64 => asm-x86}/stacktrace.h | 0
include/asm-x86/stat.h | 13 +++
.../{asm-i386/stat.h => asm-x86/stat_32.h} | 0
.../{asm-x86_64/stat.h => asm-x86/stat_64.h} | 0
include/asm-x86/statfs.h | 13 +++
.../statfs.h => asm-x86/statfs_32.h} | 0
.../statfs.h => asm-x86/statfs_64.h} | 0
include/asm-x86/string.h | 5 ++
.../string.h => asm-x86/string_32.h} | 0
.../string.h => asm-x86/string_64.h} | 0
include/asm-x86/suspend.h | 5 ++
.../suspend.h => asm-x86/suspend_32.h} | 0
.../suspend.h => asm-x86/suspend_64.h} | 0
include/{asm-x86_64 => asm-x86}/swiotlb.h | 0
include/{asm-i386 => asm-x86}/sync_bitops.h | 0
include/asm-x86/system.h | 5 ++
.../system.h => asm-x86/system_32.h} | 0
.../system.h => asm-x86/system_64.h} | 0
include/{asm-x86_64 => asm-x86}/tce.h | 0
include/asm-x86/termbits.h | 13 +++
.../termbits.h => asm-x86/termbits_32.h} | 0
.../termbits.h => asm-x86/termbits_64.h} | 0
include/asm-x86/termios.h | 13 +++
.../termios.h => asm-x86/termios_32.h} | 0
.../termios.h => asm-x86/termios_64.h} | 0
include/{asm-i386 => asm-x86}/therm_throt.h | 0
include/asm-x86/thread_info.h | 5 ++
.../thread_info_32.h} | 0
.../thread_info_64.h} | 0
include/{asm-i386 => asm-x86}/time.h | 0
include/{asm-i386 => asm-x86}/timer.h | 0
include/asm-x86/timex.h | 5 ++
.../{asm-i386/timex.h => asm-x86/timex_32.h} | 0
.../timex.h => asm-x86/timex_64.h} | 0
include/asm-x86/tlb.h | 5 ++
include/{asm-i386/tlb.h => asm-x86/tlb_32.h} | 0
.../{asm-x86_64/tlb.h => asm-x86/tlb_64.h} | 0
include/asm-x86/tlbflush.h | 5 ++
.../tlbflush.h => asm-x86/tlbflush_32.h} | 0
.../tlbflush.h => asm-x86/tlbflush_64.h} | 0
include/asm-x86/topology.h | 5 ++
.../topology.h => asm-x86/topology_32.h} | 0
.../topology.h => asm-x86/topology_64.h} | 0
include/{asm-i386 => asm-x86}/tsc.h | 0
include/asm-x86/types.h | 13 +++
.../{asm-i386/types.h => asm-x86/types_32.h} | 0
.../types.h => asm-x86/types_64.h} | 0
include/asm-x86/uaccess.h | 5 ++
.../uaccess.h => asm-x86/uaccess_32.h} | 0
.../uaccess.h => asm-x86/uaccess_64.h} | 0
include/asm-x86/ucontext.h | 13 +++
.../ucontext.h => asm-x86/ucontext_32.h} | 0
.../ucontext.h => asm-x86/ucontext_64.h} | 0
include/asm-x86/unaligned.h | 5 ++
.../unaligned.h => asm-x86/unaligned_32.h} | 0
.../unaligned.h => asm-x86/unaligned_64.h} | 0
include/asm-x86/unistd.h | 13 +++
.../unistd.h => asm-x86/unistd_32.h} | 0
.../unistd.h => asm-x86/unistd_64.h} | 0
include/asm-x86/unwind.h | 5 ++
.../unwind.h => asm-x86/unwind_32.h} | 0
.../unwind.h => asm-x86/unwind_64.h} | 0
include/asm-x86/user.h | 13 +++
include/{asm-x86_64 => asm-x86}/user32.h | 0
.../{asm-i386/user.h => asm-x86/user_32.h} | 0
.../{asm-x86_64/user.h => asm-x86/user_64.h} | 0
include/{asm-i386 => asm-x86}/vga.h | 0
include/{asm-x86_64 => asm-x86}/vgtod.h | 0
include/{asm-i386 => asm-x86}/vic.h | 0
include/{asm-i386 => asm-x86}/vm86.h | 0
include/{asm-i386 => asm-x86}/vmi.h | 0
include/{asm-i386 => asm-x86}/vmi_time.h | 0
include/{asm-i386 => asm-x86}/voyager.h | 0
include/{asm-x86_64 => asm-x86}/vsyscall.h | 0
include/{asm-x86_64 => asm-x86}/vsyscall32.h | 0
include/{asm-i386 => asm-x86}/xen/hypercall.h | 0
.../{asm-i386 => asm-x86}/xen/hypervisor.h | 0
include/{asm-i386 => asm-x86}/xen/interface.h | 0
include/asm-x86/xor.h | 5 ++
include/{asm-i386/xor.h => asm-x86/xor_32.h} | 0
.../{asm-x86_64/xor.h => asm-x86/xor_64.h} | 0
include/asm-x86_64/Kbuild | 21 -----
include/asm-x86_64/boot.h | 1 -
include/asm-x86_64/bootparam.h | 1 -
include/asm-x86_64/cpu.h | 1 -
include/asm-x86_64/emergency-restart.h | 6 --
include/asm-x86_64/fcntl.h | 1 -
include/asm-x86_64/hypertransport.h | 1 -
include/asm-x86_64/ide.h | 1 -
include/asm-x86_64/ioctl.h | 1 -
include/asm-x86_64/ist.h | 1 -
include/asm-x86_64/msidef.h | 1 -
include/asm-x86_64/msr-index.h | 1 -
include/asm-x86_64/poll.h | 1 -
include/asm-x86_64/processor-flags.h | 1 -
include/asm-x86_64/socket.h | 55 ------------
include/asm-x86_64/spinlock_types.h | 20 -----
include/asm-x86_64/therm_throt.h | 1 -
include/asm-x86_64/tsc.h | 1 -
include/asm-x86_64/vga.h | 20 -----
scripts/checksyscalls.sh | 2 +-
556 files changed, 1035 insertions(+), 182 deletions(-)
delete mode 100644 include/asm-i386/Kbuild
delete mode 100644 include/asm-i386/k8.h
delete mode 100644 include/asm-i386/pci-direct.h
delete mode 100644 include/asm-i386/stacktrace.h
create mode 100644 include/asm-x86/8253pit.h
rename include/{asm-i386/8253pit.h => asm-x86/8253pit_32.h} (100%)
rename include/{asm-x86_64/8253pit.h => asm-x86/8253pit_64.h} (100%)
create mode 100644 include/asm-x86/Kbuild
create mode 100644 include/asm-x86/a.out.h
rename include/{asm-i386/a.out.h => asm-x86/a.out_32.h} (100%)
rename include/{asm-x86_64/a.out.h => asm-x86/a.out_64.h} (100%)
create mode 100644 include/asm-x86/acpi.h
rename include/{asm-i386/acpi.h => asm-x86/acpi_32.h} (100%)
rename include/{asm-x86_64/acpi.h => asm-x86/acpi_64.h} (100%)
create mode 100644 include/asm-x86/agp.h
rename include/{asm-i386/agp.h => asm-x86/agp_32.h} (100%)
rename include/{asm-x86_64/agp.h => asm-x86/agp_64.h} (100%)
create mode 100644 include/asm-x86/alternative-asm.i
rename include/{asm-i386/alternative-asm.i => asm-x86/alternative-asm_32.i} (100%)
rename include/{asm-x86_64/alternative-asm.i => asm-x86/alternative-asm_64.i} (100%)
create mode 100644 include/asm-x86/alternative.h
rename include/{asm-i386/alternative.h => asm-x86/alternative_32.h} (100%)
rename include/{asm-x86_64/alternative.h => asm-x86/alternative_64.h} (100%)
create mode 100644 include/asm-x86/apic.h
rename include/{asm-i386/apic.h => asm-x86/apic_32.h} (100%)
rename include/{asm-x86_64/apic.h => asm-x86/apic_64.h} (100%)
create mode 100644 include/asm-x86/apicdef.h
rename include/{asm-i386/apicdef.h => asm-x86/apicdef_32.h} (100%)
rename include/{asm-x86_64/apicdef.h => asm-x86/apicdef_64.h} (100%)
rename include/{asm-i386 => asm-x86}/arch_hooks.h (100%)
create mode 100644 include/asm-x86/atomic.h
rename include/{asm-i386/atomic.h => asm-x86/atomic_32.h} (100%)
rename include/{asm-x86_64/atomic.h => asm-x86/atomic_64.h} (100%)
create mode 100644 include/asm-x86/auxvec.h
rename include/{asm-i386/auxvec.h => asm-x86/auxvec_32.h} (100%)
rename include/{asm-x86_64/auxvec.h => asm-x86/auxvec_64.h} (100%)
create mode 100644 include/asm-x86/bitops.h
rename include/{asm-i386/bitops.h => asm-x86/bitops_32.h} (100%)
rename include/{asm-x86_64/bitops.h => asm-x86/bitops_64.h} (100%)
rename include/{asm-i386 => asm-x86}/boot.h (100%)
rename include/{asm-i386 => asm-x86}/bootparam.h (100%)
rename include/{asm-x86_64 => asm-x86}/bootsetup.h (100%)
create mode 100644 include/asm-x86/bug.h
rename include/{asm-i386/bug.h => asm-x86/bug_32.h} (100%)
rename include/{asm-x86_64/bug.h => asm-x86/bug_64.h} (100%)
create mode 100644 include/asm-x86/bugs.h
rename include/{asm-i386/bugs.h => asm-x86/bugs_32.h} (100%)
rename include/{asm-x86_64/bugs.h => asm-x86/bugs_64.h} (100%)
create mode 100644 include/asm-x86/byteorder.h
rename include/{asm-i386/byteorder.h => asm-x86/byteorder_32.h} (100%)
rename include/{asm-x86_64/byteorder.h => asm-x86/byteorder_64.h} (100%)
create mode 100644 include/asm-x86/cache.h
rename include/{asm-i386/cache.h => asm-x86/cache_32.h} (100%)
rename include/{asm-x86_64/cache.h => asm-x86/cache_64.h} (100%)
create mode 100644 include/asm-x86/cacheflush.h
rename include/{asm-i386/cacheflush.h => asm-x86/cacheflush_32.h} (100%)
rename include/{asm-x86_64/cacheflush.h => asm-x86/cacheflush_64.h} (100%)
rename include/{asm-x86_64 => asm-x86}/calgary.h (100%)
rename include/{asm-x86_64 => asm-x86}/calling.h (100%)
create mode 100644 include/asm-x86/checksum.h
rename include/{asm-i386/checksum.h => asm-x86/checksum_32.h} (100%)
rename include/{asm-x86_64/checksum.h => asm-x86/checksum_64.h} (100%)
create mode 100644 include/asm-x86/cmpxchg.h
rename include/{asm-i386/cmpxchg.h => asm-x86/cmpxchg_32.h} (100%)
rename include/{asm-x86_64/cmpxchg.h => asm-x86/cmpxchg_64.h} (100%)
rename include/{asm-x86_64 => asm-x86}/compat.h (100%)
rename include/{asm-i386 => asm-x86}/cpu.h (100%)
create mode 100644 include/asm-x86/cpufeature.h
rename include/{asm-i386/cpufeature.h => asm-x86/cpufeature_32.h} (100%)
rename include/{asm-x86_64/cpufeature.h => asm-x86/cpufeature_64.h} (91%)
create mode 100644 include/asm-x86/cputime.h
rename include/{asm-i386/cputime.h => asm-x86/cputime_32.h} (100%)
rename include/{asm-x86_64/cputime.h => asm-x86/cputime_64.h} (100%)
create mode 100644 include/asm-x86/current.h
rename include/{asm-i386/current.h => asm-x86/current_32.h} (100%)
rename include/{asm-x86_64/current.h => asm-x86/current_64.h} (100%)
create mode 100644 include/asm-x86/debugreg.h
rename include/{asm-i386/debugreg.h => asm-x86/debugreg_32.h} (100%)
rename include/{asm-x86_64/debugreg.h => asm-x86/debugreg_64.h} (100%)
create mode 100644 include/asm-x86/delay.h
rename include/{asm-i386/delay.h => asm-x86/delay_32.h} (100%)
rename include/{asm-x86_64/delay.h => asm-x86/delay_64.h} (100%)
create mode 100644 include/asm-x86/desc.h
rename include/{asm-i386/desc.h => asm-x86/desc_32.h} (100%)
rename include/{asm-x86_64/desc.h => asm-x86/desc_64.h} (100%)
rename include/{asm-x86_64 => asm-x86}/desc_defs.h (100%)
create mode 100644 include/asm-x86/device.h
rename include/{asm-i386/device.h => asm-x86/device_32.h} (100%)
rename include/{asm-x86_64/device.h => asm-x86/device_64.h} (100%)
create mode 100644 include/asm-x86/div64.h
rename include/{asm-i386/div64.h => asm-x86/div64_32.h} (100%)
rename include/{asm-x86_64/div64.h => asm-x86/div64_64.h} (100%)
create mode 100644 include/asm-x86/dma-mapping.h
rename include/{asm-i386/dma-mapping.h => asm-x86/dma-mapping_32.h} (100%)
rename include/{asm-x86_64/dma-mapping.h => asm-x86/dma-mapping_64.h} (100%)
create mode 100644 include/asm-x86/dma.h
rename include/{asm-i386/dma.h => asm-x86/dma_32.h} (100%)
rename include/{asm-x86_64/dma.h => asm-x86/dma_64.h} (100%)
create mode 100644 include/asm-x86/dmi.h
rename include/{asm-i386/dmi.h => asm-x86/dmi_32.h} (100%)
rename include/{asm-x86_64/dmi.h => asm-x86/dmi_64.h} (100%)
create mode 100644 include/asm-x86/dwarf2.h
rename include/{asm-i386/dwarf2.h => asm-x86/dwarf2_32.h} (100%)
rename include/{asm-x86_64/dwarf2.h => asm-x86/dwarf2_64.h} (100%)
create mode 100644 include/asm-x86/e820.h
rename include/{asm-i386/e820.h => asm-x86/e820_32.h} (100%)
rename include/{asm-x86_64/e820.h => asm-x86/e820_64.h} (100%)
create mode 100644 include/asm-x86/edac.h
rename include/{asm-i386/edac.h => asm-x86/edac_32.h} (100%)
rename include/{asm-x86_64/edac.h => asm-x86/edac_64.h} (100%)
create mode 100644 include/asm-x86/elf.h
rename include/{asm-i386/elf.h => asm-x86/elf_32.h} (100%)
rename include/{asm-x86_64/elf.h => asm-x86/elf_64.h} (100%)
rename include/{asm-i386 => asm-x86}/emergency-restart.h (100%)
create mode 100644 include/asm-x86/errno.h
rename include/{asm-i386/errno.h => asm-x86/errno_32.h} (100%)
rename include/{asm-x86_64/errno.h => asm-x86/errno_64.h} (100%)
create mode 100644 include/asm-x86/fb.h
rename include/{asm-i386/fb.h => asm-x86/fb_32.h} (100%)
rename include/{asm-x86_64/fb.h => asm-x86/fb_64.h} (100%)
rename include/{asm-i386 => asm-x86}/fcntl.h (100%)
create mode 100644 include/asm-x86/fixmap.h
rename include/{asm-i386/fixmap.h => asm-x86/fixmap_32.h} (100%)
rename include/{asm-x86_64/fixmap.h => asm-x86/fixmap_64.h} (100%)
create mode 100644 include/asm-x86/floppy.h
rename include/{asm-i386/floppy.h => asm-x86/floppy_32.h} (100%)
rename include/{asm-x86_64/floppy.h => asm-x86/floppy_64.h} (100%)
rename include/{asm-x86_64 => asm-x86}/fpu32.h (100%)
rename include/{asm-i386 => asm-x86}/frame.i (100%)
create mode 100644 include/asm-x86/futex.h
rename include/{asm-i386/futex.h => asm-x86/futex_32.h} (100%)
rename include/{asm-x86_64/futex.h => asm-x86/futex_64.h} (100%)
create mode 100644 include/asm-x86/genapic.h
rename include/{asm-i386/genapic.h => asm-x86/genapic_32.h} (100%)
rename include/{asm-x86_64/genapic.h => asm-x86/genapic_64.h} (100%)
rename include/{asm-i386 => asm-x86}/geode.h (100%)
create mode 100644 include/asm-x86/hardirq.h
rename include/{asm-i386/hardirq.h => asm-x86/hardirq_32.h} (100%)
rename include/{asm-x86_64/hardirq.h => asm-x86/hardirq_64.h} (100%)
rename include/{asm-i386 => asm-x86}/highmem.h (100%)
create mode 100644 include/asm-x86/hpet.h
rename include/{asm-i386/hpet.h => asm-x86/hpet_32.h} (100%)
rename include/{asm-x86_64/hpet.h => asm-x86/hpet_64.h} (93%)
create mode 100644 include/asm-x86/hw_irq.h
rename include/{asm-i386/hw_irq.h => asm-x86/hw_irq_32.h} (100%)
rename include/{asm-x86_64/hw_irq.h => asm-x86/hw_irq_64.h} (100%)
rename include/{asm-i386 => asm-x86}/hypertransport.h (100%)
create mode 100644 include/asm-x86/i387.h
rename include/{asm-i386/i387.h => asm-x86/i387_32.h} (100%)
rename include/{asm-x86_64/i387.h => asm-x86/i387_64.h} (100%)
create mode 100644 include/asm-x86/i8253.h
rename include/{asm-i386/i8253.h => asm-x86/i8253_32.h} (100%)
rename include/{asm-x86_64/i8253.h => asm-x86/i8253_64.h} (100%)
rename include/{asm-i386 => asm-x86}/i8259.h (100%)
rename include/{asm-x86_64 => asm-x86}/ia32.h (100%)
rename include/{asm-x86_64 => asm-x86}/ia32_unistd.h (100%)
rename include/{asm-i386 => asm-x86}/ide.h (100%)
rename include/{asm-x86_64 => asm-x86}/idle.h (100%)
create mode 100644 include/asm-x86/intel_arch_perfmon.h
rename include/{asm-i386/intel_arch_perfmon.h => asm-x86/intel_arch_perfmon_32.h} (100%)
rename include/{asm-x86_64/intel_arch_perfmon.h => asm-x86/intel_arch_perfmon_64.h} (100%)
create mode 100644 include/asm-x86/io.h
rename include/{asm-i386/io.h => asm-x86/io_32.h} (100%)
rename include/{asm-x86_64/io.h => asm-x86/io_64.h} (100%)
create mode 100644 include/asm-x86/io_apic.h
rename include/{asm-i386/io_apic.h => asm-x86/io_apic_32.h} (100%)
rename include/{asm-x86_64/io_apic.h => asm-x86/io_apic_64.h} (100%)
rename include/{asm-i386 => asm-x86}/ioctl.h (100%)
create mode 100644 include/asm-x86/ioctls.h
rename include/{asm-i386/ioctls.h => asm-x86/ioctls_32.h} (100%)
rename include/{asm-x86_64/ioctls.h => asm-x86/ioctls_64.h} (100%)
rename include/{asm-x86_64 => asm-x86}/iommu.h (100%)
rename include/{asm-i386 => asm-x86}/ipc.h (100%)
create mode 100644 include/asm-x86/ipcbuf.h
rename include/{asm-i386/ipcbuf.h => asm-x86/ipcbuf_32.h} (100%)
rename include/{asm-x86_64/ipcbuf.h => asm-x86/ipcbuf_64.h} (100%)
rename include/{asm-x86_64 => asm-x86}/ipi.h (100%)
create mode 100644 include/asm-x86/irq.h
rename include/{asm-i386/irq.h => asm-x86/irq_32.h} (100%)
rename include/{asm-x86_64/irq.h => asm-x86/irq_64.h} (100%)
create mode 100644 include/asm-x86/irq_regs.h
rename include/{asm-i386/irq_regs.h => asm-x86/irq_regs_32.h} (100%)
rename include/{asm-x86_64/irq_regs.h => asm-x86/irq_regs_64.h} (100%)
create mode 100644 include/asm-x86/irqflags.h
rename include/{asm-i386/irqflags.h => asm-x86/irqflags_32.h} (100%)
rename include/{asm-x86_64/irqflags.h => asm-x86/irqflags_64.h} (100%)
rename include/{asm-i386 => asm-x86}/ist.h (100%)
rename include/{asm-x86_64 => asm-x86}/k8.h (100%)
create mode 100644 include/asm-x86/kdebug.h
rename include/{asm-i386/kdebug.h => asm-x86/kdebug_32.h} (100%)
rename include/{asm-x86_64/kdebug.h => asm-x86/kdebug_64.h} (100%)
create mode 100644 include/asm-x86/kexec.h
rename include/{asm-i386/kexec.h => asm-x86/kexec_32.h} (100%)
rename include/{asm-x86_64/kexec.h => asm-x86/kexec_64.h} (100%)
create mode 100644 include/asm-x86/kmap_types.h
rename include/{asm-i386/kmap_types.h => asm-x86/kmap_types_32.h} (100%)
rename include/{asm-x86_64/kmap_types.h => asm-x86/kmap_types_64.h} (100%)
create mode 100644 include/asm-x86/kprobes.h
rename include/{asm-i386/kprobes.h => asm-x86/kprobes_32.h} (100%)
rename include/{asm-x86_64/kprobes.h => asm-x86/kprobes_64.h} (100%)
create mode 100644 include/asm-x86/ldt.h
rename include/{asm-i386/ldt.h => asm-x86/ldt_32.h} (100%)
rename include/{asm-x86_64/ldt.h => asm-x86/ldt_64.h} (100%)
create mode 100644 include/asm-x86/linkage.h
rename include/{asm-i386/linkage.h => asm-x86/linkage_32.h} (100%)
rename include/{asm-x86_64/linkage.h => asm-x86/linkage_64.h} (100%)
create mode 100644 include/asm-x86/local.h
rename include/{asm-i386/local.h => asm-x86/local_32.h} (100%)
rename include/{asm-x86_64/local.h => asm-x86/local_64.h} (100%)
rename include/{asm-i386 => asm-x86}/mach-bigsmp/mach_apic.h (100%)
rename include/{asm-i386 => asm-x86}/mach-bigsmp/mach_apicdef.h (100%)
rename include/{asm-i386 => asm-x86}/mach-bigsmp/mach_ipi.h (100%)
rename include/{asm-i386 => asm-x86}/mach-bigsmp/mach_mpspec.h (100%)
rename include/{asm-i386 => asm-x86}/mach-default/apm.h (100%)
rename include/{asm-i386 => asm-x86}/mach-default/bios_ebda.h (100%)
rename include/{asm-i386 => asm-x86}/mach-default/do_timer.h (100%)
rename include/{asm-i386 => asm-x86}/mach-default/entry_arch.h (100%)
rename include/{asm-i386 => asm-x86}/mach-default/io_ports.h (100%)
rename include/{asm-i386 => asm-x86}/mach-default/irq_vectors.h (100%)
rename include/{asm-i386 => asm-x86}/mach-default/irq_vectors_limits.h (100%)
rename include/{asm-i386 => asm-x86}/mach-default/mach_apic.h (100%)
rename include/{asm-i386 => asm-x86}/mach-default/mach_apicdef.h (100%)
rename include/{asm-i386 => asm-x86}/mach-default/mach_ipi.h (100%)
rename include/{asm-i386 => asm-x86}/mach-default/mach_mpparse.h (100%)
rename include/{asm-i386 => asm-x86}/mach-default/mach_mpspec.h (100%)
rename include/{asm-i386 => asm-x86}/mach-default/mach_reboot.h (100%)
rename include/{asm-i386 => asm-x86}/mach-default/mach_time.h (100%)
rename include/{asm-i386 => asm-x86}/mach-default/mach_timer.h (100%)
rename include/{asm-i386 => asm-x86}/mach-default/mach_traps.h (100%)
rename include/{asm-i386 => asm-x86}/mach-default/mach_wakecpu.h (100%)
rename include/{asm-i386 => asm-x86}/mach-default/pci-functions.h (100%)
rename include/{asm-i386 => asm-x86}/mach-default/setup_arch.h (100%)
rename include/{asm-i386 => asm-x86}/mach-default/smpboot_hooks.h (100%)
rename include/{asm-i386 => asm-x86}/mach-es7000/mach_apic.h (100%)
rename include/{asm-i386 => asm-x86}/mach-es7000/mach_apicdef.h (100%)
rename include/{asm-i386 => asm-x86}/mach-es7000/mach_ipi.h (100%)
rename include/{asm-i386 => asm-x86}/mach-es7000/mach_mpparse.h (100%)
rename include/{asm-i386 => asm-x86}/mach-es7000/mach_mpspec.h (100%)
rename include/{asm-i386 => asm-x86}/mach-es7000/mach_wakecpu.h (100%)
rename include/{asm-i386 => asm-x86}/mach-generic/irq_vectors_limits.h (100%)
rename include/{asm-i386 => asm-x86}/mach-generic/mach_apic.h (100%)
rename include/{asm-i386 => asm-x86}/mach-generic/mach_apicdef.h (100%)
rename include/{asm-i386 => asm-x86}/mach-generic/mach_ipi.h (100%)
rename include/{asm-i386 => asm-x86}/mach-generic/mach_mpparse.h (100%)
rename include/{asm-i386 => asm-x86}/mach-generic/mach_mpspec.h (100%)
rename include/{asm-i386 => asm-x86}/mach-numaq/mach_apic.h (100%)
rename include/{asm-i386 => asm-x86}/mach-numaq/mach_apicdef.h (100%)
rename include/{asm-i386 => asm-x86}/mach-numaq/mach_ipi.h (100%)
rename include/{asm-i386 => asm-x86}/mach-numaq/mach_mpparse.h (100%)
rename include/{asm-i386 => asm-x86}/mach-numaq/mach_mpspec.h (100%)
rename include/{asm-i386 => asm-x86}/mach-numaq/mach_wakecpu.h (100%)
rename include/{asm-i386 => asm-x86}/mach-summit/irq_vectors_limits.h (100%)
rename include/{asm-i386 => asm-x86}/mach-summit/mach_apic.h (100%)
rename include/{asm-i386 => asm-x86}/mach-summit/mach_apicdef.h (100%)
rename include/{asm-i386 => asm-x86}/mach-summit/mach_ipi.h (100%)
rename include/{asm-i386 => asm-x86}/mach-summit/mach_mpparse.h (100%)
rename include/{asm-i386 => asm-x86}/mach-summit/mach_mpspec.h (100%)
rename include/{asm-i386 => asm-x86}/mach-visws/cobalt.h (100%)
rename include/{asm-i386 => asm-x86}/mach-visws/entry_arch.h (100%)
rename include/{asm-i386 => asm-x86}/mach-visws/irq_vectors.h (100%)
rename include/{asm-i386 => asm-x86}/mach-visws/lithium.h (100%)
rename include/{asm-i386 => asm-x86}/mach-visws/mach_apic.h (100%)
rename include/{asm-i386 => asm-x86}/mach-visws/mach_apicdef.h (100%)
rename include/{asm-i386 => asm-x86}/mach-visws/piix4.h (100%)
rename include/{asm-i386 => asm-x86}/mach-visws/setup_arch.h (100%)
rename include/{asm-i386 => asm-x86}/mach-visws/smpboot_hooks.h (100%)
rename include/{asm-i386 => asm-x86}/mach-voyager/do_timer.h (100%)
rename include/{asm-i386 => asm-x86}/mach-voyager/entry_arch.h (100%)
rename include/{asm-i386 => asm-x86}/mach-voyager/irq_vectors.h (100%)
rename include/{asm-i386 => asm-x86}/mach-voyager/setup_arch.h (100%)
rename include/{asm-x86_64 => asm-x86}/mach_apic.h (100%)
rename include/{asm-i386 => asm-x86}/math_emu.h (100%)
create mode 100644 include/asm-x86/mc146818rtc.h
rename include/{asm-i386/mc146818rtc.h => asm-x86/mc146818rtc_32.h} (100%)
rename include/{asm-x86_64/mc146818rtc.h => asm-x86/mc146818rtc_64.h} (100%)
rename include/{asm-i386 => asm-x86}/mca.h (100%)
rename include/{asm-i386 => asm-x86}/mca_dma.h (100%)
create mode 100644 include/asm-x86/mce.h
rename include/{asm-i386/mce.h => asm-x86/mce_32.h} (100%)
rename include/{asm-x86_64/mce.h => asm-x86/mce_64.h} (100%)
create mode 100644 include/asm-x86/mman.h
rename include/{asm-i386/mman.h => asm-x86/mman_32.h} (100%)
rename include/{asm-x86_64/mman.h => asm-x86/mman_64.h} (100%)
rename include/{asm-x86_64 => asm-x86}/mmsegment.h (100%)
create mode 100644 include/asm-x86/mmu.h
rename include/{asm-i386/mmu.h => asm-x86/mmu_32.h} (100%)
rename include/{asm-x86_64/mmu.h => asm-x86/mmu_64.h} (100%)
create mode 100644 include/asm-x86/mmu_context.h
rename include/{asm-i386/mmu_context.h => asm-x86/mmu_context_32.h} (100%)
rename include/{asm-x86_64/mmu_context.h => asm-x86/mmu_context_64.h} (100%)
rename include/{asm-i386 => asm-x86}/mmx.h (100%)
create mode 100644 include/asm-x86/mmzone.h
rename include/{asm-i386/mmzone.h => asm-x86/mmzone_32.h} (100%)
rename include/{asm-x86_64/mmzone.h => asm-x86/mmzone_64.h} (100%)
create mode 100644 include/asm-x86/module.h
rename include/{asm-i386/module.h => asm-x86/module_32.h} (100%)
rename include/{asm-x86_64/module.h => asm-x86/module_64.h} (100%)
create mode 100644 include/asm-x86/mpspec.h
rename include/{asm-i386/mpspec.h => asm-x86/mpspec_32.h} (100%)
rename include/{asm-x86_64/mpspec.h => asm-x86/mpspec_64.h} (100%)
rename include/{asm-i386 => asm-x86}/mpspec_def.h (100%)
create mode 100644 include/asm-x86/msgbuf.h
rename include/{asm-i386/msgbuf.h => asm-x86/msgbuf_32.h} (100%)
rename include/{asm-x86_64/msgbuf.h => asm-x86/msgbuf_64.h} (100%)
rename include/{asm-i386 => asm-x86}/msidef.h (100%)
rename include/{asm-i386 => asm-x86}/msr-index.h (100%)
create mode 100644 include/asm-x86/msr.h
rename include/{asm-i386/msr.h => asm-x86/msr_32.h} (100%)
rename include/{asm-x86_64/msr.h => asm-x86/msr_64.h} (100%)
create mode 100644 include/asm-x86/mtrr.h
rename include/{asm-i386/mtrr.h => asm-x86/mtrr_32.h} (100%)
rename include/{asm-x86_64/mtrr.h => asm-x86/mtrr_64.h} (100%)
create mode 100644 include/asm-x86/mutex.h
rename include/{asm-i386/mutex.h => asm-x86/mutex_32.h} (100%)
rename include/{asm-x86_64/mutex.h => asm-x86/mutex_64.h} (100%)
create mode 100644 include/asm-x86/namei.h
rename include/{asm-i386/namei.h => asm-x86/namei_32.h} (100%)
rename include/{asm-x86_64/namei.h => asm-x86/namei_64.h} (100%)
create mode 100644 include/asm-x86/nmi.h
rename include/{asm-i386/nmi.h => asm-x86/nmi_32.h} (100%)
rename include/{asm-x86_64/nmi.h => asm-x86/nmi_64.h} (100%)
create mode 100644 include/asm-x86/numa.h
rename include/{asm-i386/numa.h => asm-x86/numa_32.h} (100%)
rename include/{asm-x86_64/numa.h => asm-x86/numa_64.h} (100%)
rename include/{asm-i386 => asm-x86}/numaq.h (100%)
create mode 100644 include/asm-x86/page.h
rename include/{asm-i386/page.h => asm-x86/page_32.h} (100%)
rename include/{asm-x86_64/page.h => asm-x86/page_64.h} (100%)
create mode 100644 include/asm-x86/param.h
rename include/{asm-i386/param.h => asm-x86/param_32.h} (100%)
rename include/{asm-x86_64/param.h => asm-x86/param_64.h} (100%)
rename include/{asm-i386 => asm-x86}/paravirt.h (100%)
create mode 100644 include/asm-x86/parport.h
rename include/{asm-i386/parport.h => asm-x86/parport_32.h} (100%)
rename include/{asm-x86_64/parport.h => asm-x86/parport_64.h} (100%)
rename include/{asm-x86_64 => asm-x86}/pci-direct.h (100%)
create mode 100644 include/asm-x86/pci.h
rename include/{asm-i386/pci.h => asm-x86/pci_32.h} (100%)
rename include/{asm-x86_64/pci.h => asm-x86/pci_64.h} (100%)
rename include/{asm-x86_64 => asm-x86}/pda.h (100%)
create mode 100644 include/asm-x86/percpu.h
rename include/{asm-i386/percpu.h => asm-x86/percpu_32.h} (100%)
rename include/{asm-x86_64/percpu.h => asm-x86/percpu_64.h} (100%)
create mode 100644 include/asm-x86/pgalloc.h
rename include/{asm-i386/pgalloc.h => asm-x86/pgalloc_32.h} (100%)
rename include/{asm-x86_64/pgalloc.h => asm-x86/pgalloc_64.h} (100%)
rename include/{asm-i386 => asm-x86}/pgtable-2level-defs.h (100%)
rename include/{asm-i386 => asm-x86}/pgtable-2level.h (100%)
rename include/{asm-i386 => asm-x86}/pgtable-3level-defs.h (100%)
rename include/{asm-i386 => asm-x86}/pgtable-3level.h (100%)
create mode 100644 include/asm-x86/pgtable.h
rename include/{asm-i386/pgtable.h => asm-x86/pgtable_32.h} (100%)
rename include/{asm-x86_64/pgtable.h => asm-x86/pgtable_64.h} (100%)
rename include/{asm-i386 => asm-x86}/poll.h (100%)
create mode 100644 include/asm-x86/posix_types.h
rename include/{asm-i386/posix_types.h => asm-x86/posix_types_32.h} (100%)
rename include/{asm-x86_64/posix_types.h => asm-x86/posix_types_64.h} (100%)
rename include/{asm-x86_64 => asm-x86}/prctl.h (100%)
rename include/{asm-i386 => asm-x86}/processor-cyrix.h (100%)
rename include/{asm-i386 => asm-x86}/processor-flags.h (100%)
create mode 100644 include/asm-x86/processor.h
rename include/{asm-i386/processor.h => asm-x86/processor_32.h} (100%)
rename include/{asm-x86_64/processor.h => asm-x86/processor_64.h} (100%)
rename include/{asm-x86_64 => asm-x86}/proto.h (100%)
create mode 100644 include/asm-x86/ptrace-abi.h
rename include/{asm-i386/ptrace-abi.h => asm-x86/ptrace-abi_32.h} (100%)
rename include/{asm-x86_64/ptrace-abi.h => asm-x86/ptrace-abi_64.h} (100%)
create mode 100644 include/asm-x86/ptrace.h
rename include/{asm-i386/ptrace.h => asm-x86/ptrace_32.h} (100%)
rename include/{asm-x86_64/ptrace.h => asm-x86/ptrace_64.h} (100%)
rename include/{asm-i386 => asm-x86}/reboot.h (100%)
rename include/{asm-i386 => asm-x86}/reboot_fixups.h (100%)
create mode 100644 include/asm-x86/required-features.h
rename include/{asm-i386/required-features.h => asm-x86/required-features_32.h} (100%)
rename include/{asm-x86_64/required-features.h => asm-x86/required-features_64.h} (100%)
create mode 100644 include/asm-x86/resource.h
rename include/{asm-i386/resource.h => asm-x86/resource_32.h} (100%)
rename include/{asm-x86_64/resource.h => asm-x86/resource_64.h} (100%)
create mode 100644 include/asm-x86/resume-trace.h
rename include/{asm-i386/resume-trace.h => asm-x86/resume-trace_32.h} (100%)
rename include/{asm-x86_64/resume-trace.h => asm-x86/resume-trace_64.h} (100%)
rename include/{asm-x86_64 => asm-x86}/rio.h (100%)
create mode 100644 include/asm-x86/rtc.h
rename include/{asm-i386/rtc.h => asm-x86/rtc_32.h} (100%)
rename include/{asm-x86_64/rtc.h => asm-x86/rtc_64.h} (100%)
create mode 100644 include/asm-x86/rwlock.h
rename include/{asm-i386/rwlock.h => asm-x86/rwlock_32.h} (100%)
rename include/{asm-x86_64/rwlock.h => asm-x86/rwlock_64.h} (100%)
rename include/{asm-i386 => asm-x86}/rwsem.h (100%)
create mode 100644 include/asm-x86/scatterlist.h
rename include/{asm-i386/scatterlist.h => asm-x86/scatterlist_32.h} (100%)
rename include/{asm-x86_64/scatterlist.h => asm-x86/scatterlist_64.h} (100%)
create mode 100644 include/asm-x86/seccomp.h
rename include/{asm-i386/seccomp.h => asm-x86/seccomp_32.h} (100%)
rename include/{asm-x86_64/seccomp.h => asm-x86/seccomp_64.h} (100%)
create mode 100644 include/asm-x86/sections.h
rename include/{asm-i386/sections.h => asm-x86/sections_32.h} (100%)
rename include/{asm-x86_64/sections.h => asm-x86/sections_64.h} (100%)
create mode 100644 include/asm-x86/segment.h
rename include/{asm-i386/segment.h => asm-x86/segment_32.h} (100%)
rename include/{asm-x86_64/segment.h => asm-x86/segment_64.h} (100%)
create mode 100644 include/asm-x86/semaphore.h
rename include/{asm-i386/semaphore.h => asm-x86/semaphore_32.h} (100%)
rename include/{asm-x86_64/semaphore.h => asm-x86/semaphore_64.h} (100%)
create mode 100644 include/asm-x86/sembuf.h
rename include/{asm-i386/sembuf.h => asm-x86/sembuf_32.h} (100%)
rename include/{asm-x86_64/sembuf.h => asm-x86/sembuf_64.h} (100%)
create mode 100644 include/asm-x86/serial.h
rename include/{asm-i386/serial.h => asm-x86/serial_32.h} (100%)
rename include/{asm-x86_64/serial.h => asm-x86/serial_64.h} (100%)
create mode 100644 include/asm-x86/setup.h
rename include/{asm-i386/setup.h => asm-x86/setup_32.h} (100%)
rename include/{asm-x86_64/setup.h => asm-x86/setup_64.h} (100%)
create mode 100644 include/asm-x86/shmbuf.h
rename include/{asm-i386/shmbuf.h => asm-x86/shmbuf_32.h} (100%)
rename include/{asm-x86_64/shmbuf.h => asm-x86/shmbuf_64.h} (100%)
create mode 100644 include/asm-x86/shmparam.h
rename include/{asm-i386/shmparam.h => asm-x86/shmparam_32.h} (100%)
rename include/{asm-x86_64/shmparam.h => asm-x86/shmparam_64.h} (100%)
create mode 100644 include/asm-x86/sigcontext.h
rename include/{asm-x86_64 => asm-x86}/sigcontext32.h (100%)
rename include/{asm-i386/sigcontext.h => asm-x86/sigcontext_32.h} (100%)
rename include/{asm-x86_64/sigcontext.h => asm-x86/sigcontext_64.h} (100%)
create mode 100644 include/asm-x86/siginfo.h
rename include/{asm-i386/siginfo.h => asm-x86/siginfo_32.h} (100%)
rename include/{asm-x86_64/siginfo.h => asm-x86/siginfo_64.h} (100%)
create mode 100644 include/asm-x86/signal.h
rename include/{asm-i386/signal.h => asm-x86/signal_32.h} (100%)
rename include/{asm-x86_64/signal.h => asm-x86/signal_64.h} (100%)
create mode 100644 include/asm-x86/smp.h
rename include/{asm-i386/smp.h => asm-x86/smp_32.h} (100%)
rename include/{asm-x86_64/smp.h => asm-x86/smp_64.h} (100%)
rename include/{asm-i386 => asm-x86}/socket.h (100%)
create mode 100644 include/asm-x86/sockios.h
rename include/{asm-i386/sockios.h => asm-x86/sockios_32.h} (100%)
rename include/{asm-x86_64/sockios.h => asm-x86/sockios_64.h} (100%)
create mode 100644 include/asm-x86/sparsemem.h
rename include/{asm-i386/sparsemem.h => asm-x86/sparsemem_32.h} (100%)
rename include/{asm-x86_64/sparsemem.h => asm-x86/sparsemem_64.h} (100%)
create mode 100644 include/asm-x86/spinlock.h
rename include/{asm-i386/spinlock.h => asm-x86/spinlock_32.h} (100%)
rename include/{asm-x86_64/spinlock.h => asm-x86/spinlock_64.h} (100%)
rename include/{asm-i386 => asm-x86}/spinlock_types.h (100%)
rename include/{asm-i386 => asm-x86}/srat.h (100%)
rename include/{asm-x86_64 => asm-x86}/stacktrace.h (100%)
create mode 100644 include/asm-x86/stat.h
rename include/{asm-i386/stat.h => asm-x86/stat_32.h} (100%)
rename include/{asm-x86_64/stat.h => asm-x86/stat_64.h} (100%)
create mode 100644 include/asm-x86/statfs.h
rename include/{asm-i386/statfs.h => asm-x86/statfs_32.h} (100%)
rename include/{asm-x86_64/statfs.h => asm-x86/statfs_64.h} (100%)
create mode 100644 include/asm-x86/string.h
rename include/{asm-i386/string.h => asm-x86/string_32.h} (100%)
rename include/{asm-x86_64/string.h => asm-x86/string_64.h} (100%)
create mode 100644 include/asm-x86/suspend.h
rename include/{asm-i386/suspend.h => asm-x86/suspend_32.h} (100%)
rename include/{asm-x86_64/suspend.h => asm-x86/suspend_64.h} (100%)
rename include/{asm-x86_64 => asm-x86}/swiotlb.h (100%)
rename include/{asm-i386 => asm-x86}/sync_bitops.h (100%)
create mode 100644 include/asm-x86/system.h
rename include/{asm-i386/system.h => asm-x86/system_32.h} (100%)
rename include/{asm-x86_64/system.h => asm-x86/system_64.h} (100%)
rename include/{asm-x86_64 => asm-x86}/tce.h (100%)
create mode 100644 include/asm-x86/termbits.h
rename include/{asm-i386/termbits.h => asm-x86/termbits_32.h} (100%)
rename include/{asm-x86_64/termbits.h => asm-x86/termbits_64.h} (100%)
create mode 100644 include/asm-x86/termios.h
rename include/{asm-i386/termios.h => asm-x86/termios_32.h} (100%)
rename include/{asm-x86_64/termios.h => asm-x86/termios_64.h} (100%)
rename include/{asm-i386 => asm-x86}/therm_throt.h (100%)
create mode 100644 include/asm-x86/thread_info.h
rename include/{asm-i386/thread_info.h => asm-x86/thread_info_32.h} (100%)
rename include/{asm-x86_64/thread_info.h => asm-x86/thread_info_64.h} (100%)
rename include/{asm-i386 => asm-x86}/time.h (100%)
rename include/{asm-i386 => asm-x86}/timer.h (100%)
create mode 100644 include/asm-x86/timex.h
rename include/{asm-i386/timex.h => asm-x86/timex_32.h} (100%)
rename include/{asm-x86_64/timex.h => asm-x86/timex_64.h} (100%)
create mode 100644 include/asm-x86/tlb.h
rename include/{asm-i386/tlb.h => asm-x86/tlb_32.h} (100%)
rename include/{asm-x86_64/tlb.h => asm-x86/tlb_64.h} (100%)
create mode 100644 include/asm-x86/tlbflush.h
rename include/{asm-i386/tlbflush.h => asm-x86/tlbflush_32.h} (100%)
rename include/{asm-x86_64/tlbflush.h => asm-x86/tlbflush_64.h} (100%)
create mode 100644 include/asm-x86/topology.h
rename include/{asm-i386/topology.h => asm-x86/topology_32.h} (100%)
rename include/{asm-x86_64/topology.h => asm-x86/topology_64.h} (100%)
rename include/{asm-i386 => asm-x86}/tsc.h (100%)
create mode 100644 include/asm-x86/types.h
rename include/{asm-i386/types.h => asm-x86/types_32.h} (100%)
rename include/{asm-x86_64/types.h => asm-x86/types_64.h} (100%)
create mode 100644 include/asm-x86/uaccess.h
rename include/{asm-i386/uaccess.h => asm-x86/uaccess_32.h} (100%)
rename include/{asm-x86_64/uaccess.h => asm-x86/uaccess_64.h} (100%)
create mode 100644 include/asm-x86/ucontext.h
rename include/{asm-i386/ucontext.h => asm-x86/ucontext_32.h} (100%)
rename include/{asm-x86_64/ucontext.h => asm-x86/ucontext_64.h} (100%)
create mode 100644 include/asm-x86/unaligned.h
rename include/{asm-i386/unaligned.h => asm-x86/unaligned_32.h} (100%)
rename include/{asm-x86_64/unaligned.h => asm-x86/unaligned_64.h} (100%)
create mode 100644 include/asm-x86/unistd.h
rename include/{asm-i386/unistd.h => asm-x86/unistd_32.h} (100%)
rename include/{asm-x86_64/unistd.h => asm-x86/unistd_64.h} (100%)
create mode 100644 include/asm-x86/unwind.h
rename include/{asm-i386/unwind.h => asm-x86/unwind_32.h} (100%)
rename include/{asm-x86_64/unwind.h => asm-x86/unwind_64.h} (100%)
create mode 100644 include/asm-x86/user.h
rename include/{asm-x86_64 => asm-x86}/user32.h (100%)
rename include/{asm-i386/user.h => asm-x86/user_32.h} (100%)
rename include/{asm-x86_64/user.h => asm-x86/user_64.h} (100%)
rename include/{asm-i386 => asm-x86}/vga.h (100%)
rename include/{asm-x86_64 => asm-x86}/vgtod.h (100%)
rename include/{asm-i386 => asm-x86}/vic.h (100%)
rename include/{asm-i386 => asm-x86}/vm86.h (100%)
rename include/{asm-i386 => asm-x86}/vmi.h (100%)
rename include/{asm-i386 => asm-x86}/vmi_time.h (100%)
rename include/{asm-i386 => asm-x86}/voyager.h (100%)
rename include/{asm-x86_64 => asm-x86}/vsyscall.h (100%)
rename include/{asm-x86_64 => asm-x86}/vsyscall32.h (100%)
rename include/{asm-i386 => asm-x86}/xen/hypercall.h (100%)
rename include/{asm-i386 => asm-x86}/xen/hypervisor.h (100%)
rename include/{asm-i386 => asm-x86}/xen/interface.h (100%)
create mode 100644 include/asm-x86/xor.h
rename include/{asm-i386/xor.h => asm-x86/xor_32.h} (100%)
rename include/{asm-x86_64/xor.h => asm-x86/xor_64.h} (100%)
delete mode 100644 include/asm-x86_64/Kbuild
delete mode 100644 include/asm-x86_64/boot.h
delete mode 100644 include/asm-x86_64/bootparam.h
delete mode 100644 include/asm-x86_64/cpu.h
delete mode 100644 include/asm-x86_64/emergency-restart.h
delete mode 100644 include/asm-x86_64/fcntl.h
delete mode 100644 include/asm-x86_64/hypertransport.h
delete mode 100644 include/asm-x86_64/ide.h
delete mode 100644 include/asm-x86_64/ioctl.h
delete mode 100644 include/asm-x86_64/ist.h
delete mode 100644 include/asm-x86_64/msidef.h
delete mode 100644 include/asm-x86_64/msr-index.h
delete mode 100644 include/asm-x86_64/poll.h
delete mode 100644 include/asm-x86_64/processor-flags.h
delete mode 100644 include/asm-x86_64/socket.h
delete mode 100644 include/asm-x86_64/spinlock_types.h
delete mode 100644 include/asm-x86_64/therm_throt.h
delete mode 100644 include/asm-x86_64/tsc.h
delete mode 100644 include/asm-x86_64/vga.h
diff --git a/Documentation/lguest/lguest.c b/Documentation/lguest/lguest.c
index 73c5f1f3d5d2e..103e346c8b6ad 100644
--- a/Documentation/lguest/lguest.c
+++ b/Documentation/lguest/lguest.c
@@ -46,7 +46,7 @@ typedef uint32_t u32;
typedef uint16_t u16;
typedef uint8_t u8;
#include "../../include/linux/lguest_launcher.h"
-#include "../../include/asm-i386/e820.h"
+#include "../../include/asm-x86/e820_32.h"
/*:*/
#define PAGE_PRESENT 0x7 /* Present, RW, Execute */
diff --git a/Kbuild b/Kbuild
index 2d403cfa4b165..1570d248ad923 100644
--- a/Kbuild
+++ b/Kbuild
@@ -8,7 +8,7 @@
# 1) Generate asm-offsets.h
#
-offsets-file := include/asm-$(ARCH)/asm-offsets.h
+offsets-file := include/asm-$(SRCARCH)/asm-offsets.h
always := $(offsets-file)
targets := $(offsets-file)
diff --git a/Makefile b/Makefile
index f2067e337d4d9..2a30f5fd8294c 100644
--- a/Makefile
+++ b/Makefile
@@ -863,7 +863,7 @@ ifneq ($(KBUILD_SRC),)
/bin/false; \
fi;
$(Q)if [ ! -d include2 ]; then mkdir -p include2; fi;
- $(Q)ln -fsn $(srctree)/include/asm-$(ARCH) include2/asm
+ $(Q)ln -fsn $(srctree)/include/asm-$(SRCARCH) include2/asm
endif
# prepare2 creates a makefile if using a separate output directory
@@ -895,9 +895,9 @@ export CPPFLAGS_vmlinux.lds += -P -C -U$(ARCH)
# before switching between archs anyway.
include/asm:
- @echo ' SYMLINK $@ -> include/asm-$(ARCH)'
+ @echo ' SYMLINK $@ -> include/asm-$(SRCARCH)'
$(Q)if [ ! -d include ]; then mkdir -p include; fi;
- @ln -fsn asm-$(ARCH) $@
+ @ln -fsn asm-$(SRCARCH) $@
# Generate some files
# ---------------------------------------------------------------------------
@@ -937,7 +937,8 @@ depend dep:
INSTALL_HDR_PATH=$(objtree)/usr
export INSTALL_HDR_PATH
-HDRARCHES=$(filter-out generic,$(patsubst $(srctree)/include/asm-%/Kbuild,%,$(wildcard $(srctree)/include/asm-*/Kbuild)))
+HDRFILTER=generic i386 x86_64
+HDRARCHES=$(filter-out $(HDRFILTER),$(patsubst $(srctree)/include/asm-%/Kbuild,%,$(wildcard $(srctree)/include/asm-*/Kbuild)))
PHONY += headers_install_all
headers_install_all: include/linux/version.h scripts_basic FORCE
@@ -948,11 +949,11 @@ headers_install_all: include/linux/version.h scripts_basic FORCE
PHONY += headers_install
headers_install: include/linux/version.h scripts_basic FORCE
- @if [ ! -r $(srctree)/include/asm-$(ARCH)/Kbuild ]; then \
- echo '*** Error: Headers not exportable for this architecture ($(ARCH))'; \
+ @if [ ! -r $(srctree)/include/asm-$(SRCARCH)/Kbuild ]; then \
+ echo '*** Error: Headers not exportable for this architecture ($(SRCARCH))'; \
exit 1 ; fi
$(Q)$(MAKE) $(build)=scripts scripts/unifdef
- $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.headersinst obj=include
+ $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.headersinst ARCH=$(SRCARCH) obj=include
PHONY += headers_check_all
headers_check_all: headers_install_all
@@ -962,7 +963,7 @@ headers_check_all: headers_install_all
PHONY += headers_check
headers_check: headers_install
- $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.headersinst obj=include HDRCHECK=1
+ $(Q)$(MAKE) -f $(srctree)/scripts/Makefile.headersinst ARCH=$(SRCARCH) obj=include HDRCHECK=1
# ---------------------------------------------------------------------------
# Modules
diff --git a/arch/i386/Makefile b/arch/i386/Makefile
index 9c1da722964d2..b433dae1ac7d1 100644
--- a/arch/i386/Makefile
+++ b/arch/i386/Makefile
@@ -71,32 +71,32 @@ CFLAGS += $(cflags-y)
mcore-y := arch/x86/mach-default
# Voyager subarch support
-mflags-$(CONFIG_X86_VOYAGER) := -Iinclude/asm-i386/mach-voyager
+mflags-$(CONFIG_X86_VOYAGER) := -Iinclude/asm-x86/mach-voyager
mcore-$(CONFIG_X86_VOYAGER) := arch/x86/mach-voyager
# VISWS subarch support
-mflags-$(CONFIG_X86_VISWS) := -Iinclude/asm-i386/mach-visws
+mflags-$(CONFIG_X86_VISWS) := -Iinclude/asm-x86/mach-visws
mcore-$(CONFIG_X86_VISWS) := arch/x86/mach-visws
# NUMAQ subarch support
-mflags-$(CONFIG_X86_NUMAQ) := -Iinclude/asm-i386/mach-numaq
+mflags-$(CONFIG_X86_NUMAQ) := -Iinclude/asm-x86/mach-numaq
mcore-$(CONFIG_X86_NUMAQ) := arch/x86/mach-default
# BIGSMP subarch support
-mflags-$(CONFIG_X86_BIGSMP) := -Iinclude/asm-i386/mach-bigsmp
+mflags-$(CONFIG_X86_BIGSMP) := -Iinclude/asm-x86/mach-bigsmp
mcore-$(CONFIG_X86_BIGSMP) := arch/x86/mach-default
#Summit subarch support
-mflags-$(CONFIG_X86_SUMMIT) := -Iinclude/asm-i386/mach-summit
+mflags-$(CONFIG_X86_SUMMIT) := -Iinclude/asm-x86/mach-summit
mcore-$(CONFIG_X86_SUMMIT) := arch/x86/mach-default
# generic subarchitecture
-mflags-$(CONFIG_X86_GENERICARCH) := -Iinclude/asm-i386/mach-generic
+mflags-$(CONFIG_X86_GENERICARCH) := -Iinclude/asm-x86/mach-generic
mcore-$(CONFIG_X86_GENERICARCH) := arch/x86/mach-default
core-$(CONFIG_X86_GENERICARCH) += arch/x86/mach-generic/
# ES7000 subarch support
-mflags-$(CONFIG_X86_ES7000) := -Iinclude/asm-i386/mach-es7000
+mflags-$(CONFIG_X86_ES7000) := -Iinclude/asm-x86/mach-es7000
mcore-$(CONFIG_X86_ES7000) := arch/x86/mach-default
core-$(CONFIG_X86_ES7000) := arch/x86/mach-es7000/
@@ -104,7 +104,7 @@ core-$(CONFIG_X86_ES7000) := arch/x86/mach-es7000/
core-$(CONFIG_XEN) += arch/x86/xen/
# default subarch .h files
-mflags-y += -Iinclude/asm-i386/mach-default
+mflags-y += -Iinclude/asm-x86/mach-default
head-y := arch/x86/kernel/head_32.o arch/x86/kernel/init_task_32.o
diff --git a/arch/ia64/ia32/audit.c b/arch/ia64/ia32/audit.c
index 8850fe40ea342..5e901c75df1bd 100644
--- a/arch/ia64/ia32/audit.c
+++ b/arch/ia64/ia32/audit.c
@@ -1,4 +1,4 @@
-#include <asm-i386/unistd.h>
+#include <asm-x86/unistd_32.h>
unsigned ia32_dir_class[] = {
#include <asm-generic/audit_dir_write.h>
diff --git a/arch/um/sys-x86_64/syscall_table.c b/arch/um/sys-x86_64/syscall_table.c
index 5133988d36101..71b2ae4ad5de1 100644
--- a/arch/um/sys-x86_64/syscall_table.c
+++ b/arch/um/sys-x86_64/syscall_table.c
@@ -36,7 +36,7 @@
#define __SYSCALL(nr, sym) extern asmlinkage void sym(void) ;
#undef _ASM_X86_64_UNISTD_H_
-#include <asm-x86_64/unistd.h>
+#include <asm-x86/unistd_64.h>
#undef __SYSCALL
#define __SYSCALL(nr, sym) [ nr ] = sym,
@@ -49,5 +49,5 @@ extern void sys_ni_syscall(void);
sys_call_ptr_t sys_call_table[UM_NR_syscall_max+1] __cacheline_aligned = {
/* Smells like a like a compiler bug -- it doesn't work when the & below is removed. */
[0 ... UM_NR_syscall_max] = &sys_ni_syscall,
-#include <asm-x86_64/unistd.h>
+#include <asm-x86/unistd_64.h>
};
diff --git a/arch/x86/ia32/audit.c b/arch/x86/ia32/audit.c
index 8850fe40ea342..91b7b5922dfa8 100644
--- a/arch/x86/ia32/audit.c
+++ b/arch/x86/ia32/audit.c
@@ -1,4 +1,4 @@
-#include <asm-i386/unistd.h>
+#include <asm/unistd_32.h>
unsigned ia32_dir_class[] = {
#include <asm-generic/audit_dir_write.h>
diff --git a/arch/x86/ia32/ipc32.c b/arch/x86/ia32/ipc32.c
index 369151dc3213e..2e1869ec4db45 100644
--- a/arch/x86/ia32/ipc32.c
+++ b/arch/x86/ia32/ipc32.c
@@ -9,7 +9,7 @@
#include <linux/ipc.h>
#include <linux/compat.h>
-#include <asm-i386/ipc.h>
+#include <asm/ipc.h>
asmlinkage long
sys32_ipc(u32 call, int first, int second, int third,
diff --git a/arch/x86/kernel/cpu/mtrr/state.c b/arch/x86/kernel/cpu/mtrr/state.c
index c9014ca4a575d..49e20c2afcdf7 100644
--- a/arch/x86/kernel/cpu/mtrr/state.c
+++ b/arch/x86/kernel/cpu/mtrr/state.c
@@ -3,7 +3,7 @@
#include <asm/io.h>
#include <asm/mtrr.h>
#include <asm/msr.h>
-#include <asm-i386/processor-cyrix.h>
+#include <asm/processor-cyrix.h>
#include "mtrr.h"
diff --git a/arch/x86/kernel/syscall_64.c b/arch/x86/kernel/syscall_64.c
index 63d592c276cc4..9d498c2f8eea8 100644
--- a/arch/x86/kernel/syscall_64.c
+++ b/arch/x86/kernel/syscall_64.c
@@ -9,7 +9,7 @@
#define __SYSCALL(nr, sym) extern asmlinkage void sym(void) ;
#undef _ASM_X86_64_UNISTD_H_
-#include <asm-x86_64/unistd.h>
+#include <asm/unistd_64.h>
#undef __SYSCALL
#define __SYSCALL(nr, sym) [ nr ] = sym,
@@ -22,5 +22,5 @@ extern void sys_ni_syscall(void);
const sys_call_ptr_t sys_call_table[__NR_syscall_max+1] = {
/* Smells like a like a compiler bug -- it doesn't work when the & below is removed. */
[0 ... __NR_syscall_max] = &sys_ni_syscall,
-#include <asm-x86_64/unistd.h>
+#include <asm/unistd_64.h>
};
diff --git a/include/asm-i386/Kbuild b/include/asm-i386/Kbuild
deleted file mode 100644
index cbf6e8f1087b6..0000000000000
--- a/include/asm-i386/Kbuild
+++ /dev/null
@@ -1,12 +0,0 @@
-include include/asm-generic/Kbuild.asm
-
-header-y += boot.h
-header-y += debugreg.h
-header-y += ldt.h
-header-y += msr-index.h
-header-y += ptrace-abi.h
-header-y += ucontext.h
-
-unifdef-y += msr.h
-unifdef-y += mtrr.h
-unifdef-y += vm86.h
diff --git a/include/asm-i386/k8.h b/include/asm-i386/k8.h
deleted file mode 100644
index dfd88a6e60403..0000000000000
--- a/include/asm-i386/k8.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-x86_64/k8.h>
diff --git a/include/asm-i386/pci-direct.h b/include/asm-i386/pci-direct.h
deleted file mode 100644
index 4f6738b08206c..0000000000000
--- a/include/asm-i386/pci-direct.h
+++ /dev/null
@@ -1 +0,0 @@
-#include "asm-x86_64/pci-direct.h"
diff --git a/include/asm-i386/stacktrace.h b/include/asm-i386/stacktrace.h
deleted file mode 100644
index 7d1f6a5cbfca5..0000000000000
--- a/include/asm-i386/stacktrace.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-x86_64/stacktrace.h>
diff --git a/include/asm-sh/mpc1211/mc146818rtc.h b/include/asm-sh/mpc1211/mc146818rtc.h
index 0ec78f66cea40..e245f2a3cd78e 100644
--- a/include/asm-sh/mpc1211/mc146818rtc.h
+++ b/include/asm-sh/mpc1211/mc146818rtc.h
@@ -1,6 +1,6 @@
/*
* MPC1211 uses PC/AT style RTC definitions.
*/
-#include <asm-i386/mc146818rtc.h>
+#include <asm-x86/mc146818rtc_32.h>
diff --git a/include/asm-x86/8253pit.h b/include/asm-x86/8253pit.h
new file mode 100644
index 0000000000000..d3c2b38a66186
--- /dev/null
+++ b/include/asm-x86/8253pit.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "8253pit_32.h"
+#else
+# include "8253pit_64.h"
+#endif
diff --git a/include/asm-i386/8253pit.h b/include/asm-x86/8253pit_32.h
similarity index 100%
rename from include/asm-i386/8253pit.h
rename to include/asm-x86/8253pit_32.h
diff --git a/include/asm-x86_64/8253pit.h b/include/asm-x86/8253pit_64.h
similarity index 100%
rename from include/asm-x86_64/8253pit.h
rename to include/asm-x86/8253pit_64.h
diff --git a/include/asm-x86/Kbuild b/include/asm-x86/Kbuild
new file mode 100644
index 0000000000000..c5e43cb39874f
--- /dev/null
+++ b/include/asm-x86/Kbuild
@@ -0,0 +1,88 @@
+include include/asm-generic/Kbuild.asm
+
+header-y += boot.h
+header-y += bootsetup.h
+header-y += debugreg_32.h
+header-y += debugreg_64.h
+header-y += debugreg.h
+header-y += ldt_32.h
+header-y += ldt_64.h
+header-y += ldt.h
+header-y += msr-index.h
+header-y += prctl.h
+header-y += ptrace-abi_32.h
+header-y += ptrace-abi_64.h
+header-y += ptrace-abi.h
+header-y += sigcontext32.h
+header-y += ucontext_32.h
+header-y += ucontext_64.h
+header-y += ucontext.h
+header-y += vsyscall32.h
+
+unifdef-y += a.out_32.h
+unifdef-y += a.out_64.h
+unifdef-y += auxvec_32.h
+unifdef-y += auxvec_64.h
+unifdef-y += byteorder_32.h
+unifdef-y += byteorder_64.h
+unifdef-y += elf_32.h
+unifdef-y += elf_64.h
+unifdef-y += errno_32.h
+unifdef-y += errno_64.h
+unifdef-y += ioctls_32.h
+unifdef-y += ioctls_64.h
+unifdef-y += ipcbuf_32.h
+unifdef-y += ipcbuf_64.h
+unifdef-y += mce.h
+unifdef-y += mman_32.h
+unifdef-y += mman_64.h
+unifdef-y += msgbuf_32.h
+unifdef-y += msgbuf_64.h
+unifdef-y += msr_32.h
+unifdef-y += msr_64.h
+unifdef-y += msr.h
+unifdef-y += mtrr_32.h
+unifdef-y += mtrr_64.h
+unifdef-y += mtrr.h
+unifdef-y += page_32.h
+unifdef-y += page_64.h
+unifdef-y += param_32.h
+unifdef-y += param_64.h
+unifdef-y += posix_types_32.h
+unifdef-y += posix_types_64.h
+unifdef-y += ptrace_32.h
+unifdef-y += ptrace_64.h
+unifdef-y += resource_32.h
+unifdef-y += resource_64.h
+unifdef-y += sembuf_32.h
+unifdef-y += sembuf_64.h
+unifdef-y += setup_32.h
+unifdef-y += setup_64.h
+unifdef-y += shmbuf_32.h
+unifdef-y += shmbuf_64.h
+unifdef-y += shmparam_32.h
+unifdef-y += shmparam_64.h
+unifdef-y += sigcontext_32.h
+unifdef-y += sigcontext_64.h
+unifdef-y += siginfo_32.h
+unifdef-y += siginfo_64.h
+unifdef-y += signal_32.h
+unifdef-y += signal_64.h
+unifdef-y += sockios_32.h
+unifdef-y += sockios_64.h
+unifdef-y += stat_32.h
+unifdef-y += stat_64.h
+unifdef-y += statfs_32.h
+unifdef-y += statfs_64.h
+unifdef-y += termbits_32.h
+unifdef-y += termbits_64.h
+unifdef-y += termios_32.h
+unifdef-y += termios_64.h
+unifdef-y += types_32.h
+unifdef-y += types_64.h
+unifdef-y += unistd_32.h
+unifdef-y += unistd_64.h
+unifdef-y += user_32.h
+unifdef-y += user_64.h
+unifdef-y += vm86.h
+unifdef-y += vsyscall.h
diff --git a/include/asm-x86/a.out.h b/include/asm-x86/a.out.h
new file mode 100644
index 0000000000000..5bc9b1d3b2271
--- /dev/null
+++ b/include/asm-x86/a.out.h
@@ -0,0 +1,13 @@
+#ifdef __KERNEL__
+# ifdef CONFIG_X86_32
+# include "a.out_32.h"
+# else
+# include "a.out_64.h"
+# endif
+#else
+# ifdef __i386__
+# include "a.out_32.h"
+# else
+# include "a.out_64.h"
+# endif
+#endif
diff --git a/include/asm-i386/a.out.h b/include/asm-x86/a.out_32.h
similarity index 100%
rename from include/asm-i386/a.out.h
rename to include/asm-x86/a.out_32.h
diff --git a/include/asm-x86_64/a.out.h b/include/asm-x86/a.out_64.h
similarity index 100%
rename from include/asm-x86_64/a.out.h
rename to include/asm-x86/a.out_64.h
diff --git a/include/asm-x86/acpi.h b/include/asm-x86/acpi.h
new file mode 100644
index 0000000000000..0693689d4146b
--- /dev/null
+++ b/include/asm-x86/acpi.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "acpi_32.h"
+#else
+# include "acpi_64.h"
+#endif
diff --git a/include/asm-i386/acpi.h b/include/asm-x86/acpi_32.h
similarity index 100%
rename from include/asm-i386/acpi.h
rename to include/asm-x86/acpi_32.h
diff --git a/include/asm-x86_64/acpi.h b/include/asm-x86/acpi_64.h
similarity index 100%
rename from include/asm-x86_64/acpi.h
rename to include/asm-x86/acpi_64.h
diff --git a/include/asm-x86/agp.h b/include/asm-x86/agp.h
new file mode 100644
index 0000000000000..9348f1e4f6f13
--- /dev/null
+++ b/include/asm-x86/agp.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "agp_32.h"
+#else
+# include "agp_64.h"
+#endif
diff --git a/include/asm-i386/agp.h b/include/asm-x86/agp_32.h
similarity index 100%
rename from include/asm-i386/agp.h
rename to include/asm-x86/agp_32.h
diff --git a/include/asm-x86_64/agp.h b/include/asm-x86/agp_64.h
similarity index 100%
rename from include/asm-x86_64/agp.h
rename to include/asm-x86/agp_64.h
diff --git a/include/asm-x86/alternative-asm.i b/include/asm-x86/alternative-asm.i
new file mode 100644
index 0000000000000..4f360cd3c8884
--- /dev/null
+++ b/include/asm-x86/alternative-asm.i
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "alternative-asm_32.i"
+#else
+# include "alternative-asm_64.i"
+#endif
diff --git a/include/asm-i386/alternative-asm.i b/include/asm-x86/alternative-asm_32.i
similarity index 100%
rename from include/asm-i386/alternative-asm.i
rename to include/asm-x86/alternative-asm_32.i
diff --git a/include/asm-x86_64/alternative-asm.i b/include/asm-x86/alternative-asm_64.i
similarity index 100%
rename from include/asm-x86_64/alternative-asm.i
rename to include/asm-x86/alternative-asm_64.i
diff --git a/include/asm-x86/alternative.h b/include/asm-x86/alternative.h
new file mode 100644
index 0000000000000..9eef6a32a1304
--- /dev/null
+++ b/include/asm-x86/alternative.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "alternative_32.h"
+#else
+# include "alternative_64.h"
+#endif
diff --git a/include/asm-i386/alternative.h b/include/asm-x86/alternative_32.h
similarity index 100%
rename from include/asm-i386/alternative.h
rename to include/asm-x86/alternative_32.h
diff --git a/include/asm-x86_64/alternative.h b/include/asm-x86/alternative_64.h
similarity index 100%
rename from include/asm-x86_64/alternative.h
rename to include/asm-x86/alternative_64.h
diff --git a/include/asm-x86/apic.h b/include/asm-x86/apic.h
new file mode 100644
index 0000000000000..9fbcc0bd2ac49
--- /dev/null
+++ b/include/asm-x86/apic.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "apic_32.h"
+#else
+# include "apic_64.h"
+#endif
diff --git a/include/asm-i386/apic.h b/include/asm-x86/apic_32.h
similarity index 100%
rename from include/asm-i386/apic.h
rename to include/asm-x86/apic_32.h
diff --git a/include/asm-x86_64/apic.h b/include/asm-x86/apic_64.h
similarity index 100%
rename from include/asm-x86_64/apic.h
rename to include/asm-x86/apic_64.h
diff --git a/include/asm-x86/apicdef.h b/include/asm-x86/apicdef.h
new file mode 100644
index 0000000000000..4542c220bf4d7
--- /dev/null
+++ b/include/asm-x86/apicdef.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "apicdef_32.h"
+#else
+# include "apicdef_64.h"
+#endif
diff --git a/include/asm-i386/apicdef.h b/include/asm-x86/apicdef_32.h
similarity index 100%
rename from include/asm-i386/apicdef.h
rename to include/asm-x86/apicdef_32.h
diff --git a/include/asm-x86_64/apicdef.h b/include/asm-x86/apicdef_64.h
similarity index 100%
rename from include/asm-x86_64/apicdef.h
rename to include/asm-x86/apicdef_64.h
diff --git a/include/asm-i386/arch_hooks.h b/include/asm-x86/arch_hooks.h
similarity index 100%
rename from include/asm-i386/arch_hooks.h
rename to include/asm-x86/arch_hooks.h
diff --git a/include/asm-x86/atomic.h b/include/asm-x86/atomic.h
new file mode 100644
index 0000000000000..4e1b8873c4743
--- /dev/null
+++ b/include/asm-x86/atomic.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "atomic_32.h"
+#else
+# include "atomic_64.h"
+#endif
diff --git a/include/asm-i386/atomic.h b/include/asm-x86/atomic_32.h
similarity index 100%
rename from include/asm-i386/atomic.h
rename to include/asm-x86/atomic_32.h
diff --git a/include/asm-x86_64/atomic.h b/include/asm-x86/atomic_64.h
similarity index 100%
rename from include/asm-x86_64/atomic.h
rename to include/asm-x86/atomic_64.h
diff --git a/include/asm-x86/auxvec.h b/include/asm-x86/auxvec.h
new file mode 100644
index 0000000000000..7ff866f829caa
--- /dev/null
+++ b/include/asm-x86/auxvec.h
@@ -0,0 +1,13 @@
+#ifdef __KERNEL__
+# ifdef CONFIG_X86_32
+# include "auxvec_32.h"
+# else
+# include "auxvec_64.h"
+# endif
+#else
+# ifdef __i386__
+# include "auxvec_32.h"
+# else
+# include "auxvec_64.h"
+# endif
+#endif
diff --git a/include/asm-i386/auxvec.h b/include/asm-x86/auxvec_32.h
similarity index 100%
rename from include/asm-i386/auxvec.h
rename to include/asm-x86/auxvec_32.h
diff --git a/include/asm-x86_64/auxvec.h b/include/asm-x86/auxvec_64.h
similarity index 100%
rename from include/asm-x86_64/auxvec.h
rename to include/asm-x86/auxvec_64.h
diff --git a/include/asm-x86/bitops.h b/include/asm-x86/bitops.h
new file mode 100644
index 0000000000000..07e3f6d4fe479
--- /dev/null
+++ b/include/asm-x86/bitops.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "bitops_32.h"
+#else
+# include "bitops_64.h"
+#endif
diff --git a/include/asm-i386/bitops.h b/include/asm-x86/bitops_32.h
similarity index 100%
rename from include/asm-i386/bitops.h
rename to include/asm-x86/bitops_32.h
diff --git a/include/asm-x86_64/bitops.h b/include/asm-x86/bitops_64.h
similarity index 100%
rename from include/asm-x86_64/bitops.h
rename to include/asm-x86/bitops_64.h
diff --git a/include/asm-i386/boot.h b/include/asm-x86/boot.h
similarity index 100%
rename from include/asm-i386/boot.h
rename to include/asm-x86/boot.h
diff --git a/include/asm-i386/bootparam.h b/include/asm-x86/bootparam.h
similarity index 100%
rename from include/asm-i386/bootparam.h
rename to include/asm-x86/bootparam.h
diff --git a/include/asm-x86_64/bootsetup.h b/include/asm-x86/bootsetup.h
similarity index 100%
rename from include/asm-x86_64/bootsetup.h
rename to include/asm-x86/bootsetup.h
diff --git a/include/asm-x86/bug.h b/include/asm-x86/bug.h
new file mode 100644
index 0000000000000..c655d7f3a5e04
--- /dev/null
+++ b/include/asm-x86/bug.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "bug_32.h"
+#else
+# include "bug_64.h"
+#endif
diff --git a/include/asm-i386/bug.h b/include/asm-x86/bug_32.h
similarity index 100%
rename from include/asm-i386/bug.h
rename to include/asm-x86/bug_32.h
diff --git a/include/asm-x86_64/bug.h b/include/asm-x86/bug_64.h
similarity index 100%
rename from include/asm-x86_64/bug.h
rename to include/asm-x86/bug_64.h
diff --git a/include/asm-x86/bugs.h b/include/asm-x86/bugs.h
new file mode 100644
index 0000000000000..ddf42d36dd506
--- /dev/null
+++ b/include/asm-x86/bugs.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "bugs_32.h"
+#else
+# include "bugs_64.h"
+#endif
diff --git a/include/asm-i386/bugs.h b/include/asm-x86/bugs_32.h
similarity index 100%
rename from include/asm-i386/bugs.h
rename to include/asm-x86/bugs_32.h
diff --git a/include/asm-x86_64/bugs.h b/include/asm-x86/bugs_64.h
similarity index 100%
rename from include/asm-x86_64/bugs.h
rename to include/asm-x86/bugs_64.h
diff --git a/include/asm-x86/byteorder.h b/include/asm-x86/byteorder.h
new file mode 100644
index 0000000000000..eb14b1870ed72
--- /dev/null
+++ b/include/asm-x86/byteorder.h
@@ -0,0 +1,13 @@
+#ifdef __KERNEL__
+# ifdef CONFIG_X86_32
+# include "byteorder_32.h"
+# else
+# include "byteorder_64.h"
+# endif
+#else
+# ifdef __i386__
+# include "byteorder_32.h"
+# else
+# include "byteorder_64.h"
+# endif
+#endif
diff --git a/include/asm-i386/byteorder.h b/include/asm-x86/byteorder_32.h
similarity index 100%
rename from include/asm-i386/byteorder.h
rename to include/asm-x86/byteorder_32.h
diff --git a/include/asm-x86_64/byteorder.h b/include/asm-x86/byteorder_64.h
similarity index 100%
rename from include/asm-x86_64/byteorder.h
rename to include/asm-x86/byteorder_64.h
diff --git a/include/asm-x86/cache.h b/include/asm-x86/cache.h
new file mode 100644
index 0000000000000..c36d190ac9d8f
--- /dev/null
+++ b/include/asm-x86/cache.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "cache_32.h"
+#else
+# include "cache_64.h"
+#endif
diff --git a/include/asm-i386/cache.h b/include/asm-x86/cache_32.h
similarity index 100%
rename from include/asm-i386/cache.h
rename to include/asm-x86/cache_32.h
diff --git a/include/asm-x86_64/cache.h b/include/asm-x86/cache_64.h
similarity index 100%
rename from include/asm-x86_64/cache.h
rename to include/asm-x86/cache_64.h
diff --git a/include/asm-x86/cacheflush.h b/include/asm-x86/cacheflush.h
new file mode 100644
index 0000000000000..e2df3b55034a3
--- /dev/null
+++ b/include/asm-x86/cacheflush.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "cacheflush_32.h"
+#else
+# include "cacheflush_64.h"
+#endif
diff --git a/include/asm-i386/cacheflush.h b/include/asm-x86/cacheflush_32.h
similarity index 100%
rename from include/asm-i386/cacheflush.h
rename to include/asm-x86/cacheflush_32.h
diff --git a/include/asm-x86_64/cacheflush.h b/include/asm-x86/cacheflush_64.h
similarity index 100%
rename from include/asm-x86_64/cacheflush.h
rename to include/asm-x86/cacheflush_64.h
diff --git a/include/asm-x86_64/calgary.h b/include/asm-x86/calgary.h
similarity index 100%
rename from include/asm-x86_64/calgary.h
rename to include/asm-x86/calgary.h
diff --git a/include/asm-x86_64/calling.h b/include/asm-x86/calling.h
similarity index 100%
rename from include/asm-x86_64/calling.h
rename to include/asm-x86/calling.h
diff --git a/include/asm-x86/checksum.h b/include/asm-x86/checksum.h
new file mode 100644
index 0000000000000..848850fd7d62f
--- /dev/null
+++ b/include/asm-x86/checksum.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "checksum_32.h"
+#else
+# include "checksum_64.h"
+#endif
diff --git a/include/asm-i386/checksum.h b/include/asm-x86/checksum_32.h
similarity index 100%
rename from include/asm-i386/checksum.h
rename to include/asm-x86/checksum_32.h
diff --git a/include/asm-x86_64/checksum.h b/include/asm-x86/checksum_64.h
similarity index 100%
rename from include/asm-x86_64/checksum.h
rename to include/asm-x86/checksum_64.h
diff --git a/include/asm-x86/cmpxchg.h b/include/asm-x86/cmpxchg.h
new file mode 100644
index 0000000000000..a460fa088d4c0
--- /dev/null
+++ b/include/asm-x86/cmpxchg.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "cmpxchg_32.h"
+#else
+# include "cmpxchg_64.h"
+#endif
diff --git a/include/asm-i386/cmpxchg.h b/include/asm-x86/cmpxchg_32.h
similarity index 100%
rename from include/asm-i386/cmpxchg.h
rename to include/asm-x86/cmpxchg_32.h
diff --git a/include/asm-x86_64/cmpxchg.h b/include/asm-x86/cmpxchg_64.h
similarity index 100%
rename from include/asm-x86_64/cmpxchg.h
rename to include/asm-x86/cmpxchg_64.h
diff --git a/include/asm-x86_64/compat.h b/include/asm-x86/compat.h
similarity index 100%
rename from include/asm-x86_64/compat.h
rename to include/asm-x86/compat.h
diff --git a/include/asm-i386/cpu.h b/include/asm-x86/cpu.h
similarity index 100%
rename from include/asm-i386/cpu.h
rename to include/asm-x86/cpu.h
diff --git a/include/asm-x86/cpufeature.h b/include/asm-x86/cpufeature.h
new file mode 100644
index 0000000000000..b7160a4598d74
--- /dev/null
+++ b/include/asm-x86/cpufeature.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "cpufeature_32.h"
+#else
+# include "cpufeature_64.h"
+#endif
diff --git a/include/asm-i386/cpufeature.h b/include/asm-x86/cpufeature_32.h
similarity index 100%
rename from include/asm-i386/cpufeature.h
rename to include/asm-x86/cpufeature_32.h
diff --git a/include/asm-x86_64/cpufeature.h b/include/asm-x86/cpufeature_64.h
similarity index 91%
rename from include/asm-x86_64/cpufeature.h
rename to include/asm-x86/cpufeature_64.h
index 8baefc3beb2e1..2983501e8b3e4 100644
--- a/include/asm-x86_64/cpufeature.h
+++ b/include/asm-x86/cpufeature_64.h
@@ -1,5 +1,5 @@
/*
- * cpufeature.h
+ * cpufeature_32.h
*
* Defines x86 CPU feature bits
*/
@@ -7,7 +7,7 @@
#ifndef __ASM_X8664_CPUFEATURE_H
#define __ASM_X8664_CPUFEATURE_H
-#include <asm-i386/cpufeature.h>
+#include <asm/cpufeature_32.h>
#undef cpu_has_vme
#define cpu_has_vme 0
diff --git a/include/asm-x86/cputime.h b/include/asm-x86/cputime.h
new file mode 100644
index 0000000000000..87c37cf6b707c
--- /dev/null
+++ b/include/asm-x86/cputime.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "cputime_32.h"
+#else
+# include "cputime_64.h"
+#endif
diff --git a/include/asm-i386/cputime.h b/include/asm-x86/cputime_32.h
similarity index 100%
rename from include/asm-i386/cputime.h
rename to include/asm-x86/cputime_32.h
diff --git a/include/asm-x86_64/cputime.h b/include/asm-x86/cputime_64.h
similarity index 100%
rename from include/asm-x86_64/cputime.h
rename to include/asm-x86/cputime_64.h
diff --git a/include/asm-x86/current.h b/include/asm-x86/current.h
new file mode 100644
index 0000000000000..d2526d3f73468
--- /dev/null
+++ b/include/asm-x86/current.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "current_32.h"
+#else
+# include "current_64.h"
+#endif
diff --git a/include/asm-i386/current.h b/include/asm-x86/current_32.h
similarity index 100%
rename from include/asm-i386/current.h
rename to include/asm-x86/current_32.h
diff --git a/include/asm-x86_64/current.h b/include/asm-x86/current_64.h
similarity index 100%
rename from include/asm-x86_64/current.h
rename to include/asm-x86/current_64.h
diff --git a/include/asm-x86/debugreg.h b/include/asm-x86/debugreg.h
new file mode 100644
index 0000000000000..b6ce7e4fa0022
--- /dev/null
+++ b/include/asm-x86/debugreg.h
@@ -0,0 +1,13 @@
+#ifdef __KERNEL__
+# ifdef CONFIG_X86_32
+# include "debugreg_32.h"
+# else
+# include "debugreg_64.h"
+# endif
+#else
+# ifdef __i386__
+# include "debugreg_32.h"
+# else
+# include "debugreg_64.h"
+# endif
+#endif
diff --git a/include/asm-i386/debugreg.h b/include/asm-x86/debugreg_32.h
similarity index 100%
rename from include/asm-i386/debugreg.h
rename to include/asm-x86/debugreg_32.h
diff --git a/include/asm-x86_64/debugreg.h b/include/asm-x86/debugreg_64.h
similarity index 100%
rename from include/asm-x86_64/debugreg.h
rename to include/asm-x86/debugreg_64.h
diff --git a/include/asm-x86/delay.h b/include/asm-x86/delay.h
new file mode 100644
index 0000000000000..10f2c71d622ba
--- /dev/null
+++ b/include/asm-x86/delay.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "delay_32.h"
+#else
+# include "delay_64.h"
+#endif
diff --git a/include/asm-i386/delay.h b/include/asm-x86/delay_32.h
similarity index 100%
rename from include/asm-i386/delay.h
rename to include/asm-x86/delay_32.h
diff --git a/include/asm-x86_64/delay.h b/include/asm-x86/delay_64.h
similarity index 100%
rename from include/asm-x86_64/delay.h
rename to include/asm-x86/delay_64.h
diff --git a/include/asm-x86/desc.h b/include/asm-x86/desc.h
new file mode 100644
index 0000000000000..6065c5092265b
--- /dev/null
+++ b/include/asm-x86/desc.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "desc_32.h"
+#else
+# include "desc_64.h"
+#endif
diff --git a/include/asm-i386/desc.h b/include/asm-x86/desc_32.h
similarity index 100%
rename from include/asm-i386/desc.h
rename to include/asm-x86/desc_32.h
diff --git a/include/asm-x86_64/desc.h b/include/asm-x86/desc_64.h
similarity index 100%
rename from include/asm-x86_64/desc.h
rename to include/asm-x86/desc_64.h
diff --git a/include/asm-x86_64/desc_defs.h b/include/asm-x86/desc_defs.h
similarity index 100%
rename from include/asm-x86_64/desc_defs.h
rename to include/asm-x86/desc_defs.h
diff --git a/include/asm-x86/device.h b/include/asm-x86/device.h
new file mode 100644
index 0000000000000..e2bcf7c7dcee6
--- /dev/null
+++ b/include/asm-x86/device.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "device_32.h"
+#else
+# include "device_64.h"
+#endif
diff --git a/include/asm-i386/device.h b/include/asm-x86/device_32.h
similarity index 100%
rename from include/asm-i386/device.h
rename to include/asm-x86/device_32.h
diff --git a/include/asm-x86_64/device.h b/include/asm-x86/device_64.h
similarity index 100%
rename from include/asm-x86_64/device.h
rename to include/asm-x86/device_64.h
diff --git a/include/asm-x86/div64.h b/include/asm-x86/div64.h
new file mode 100644
index 0000000000000..8ac7da6ca284b
--- /dev/null
+++ b/include/asm-x86/div64.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "div64_32.h"
+#else
+# include "div64_64.h"
+#endif
diff --git a/include/asm-i386/div64.h b/include/asm-x86/div64_32.h
similarity index 100%
rename from include/asm-i386/div64.h
rename to include/asm-x86/div64_32.h
diff --git a/include/asm-x86_64/div64.h b/include/asm-x86/div64_64.h
similarity index 100%
rename from include/asm-x86_64/div64.h
rename to include/asm-x86/div64_64.h
diff --git a/include/asm-x86/dma-mapping.h b/include/asm-x86/dma-mapping.h
new file mode 100644
index 0000000000000..58f790f4df525
--- /dev/null
+++ b/include/asm-x86/dma-mapping.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "dma-mapping_32.h"
+#else
+# include "dma-mapping_64.h"
+#endif
diff --git a/include/asm-i386/dma-mapping.h b/include/asm-x86/dma-mapping_32.h
similarity index 100%
rename from include/asm-i386/dma-mapping.h
rename to include/asm-x86/dma-mapping_32.h
diff --git a/include/asm-x86_64/dma-mapping.h b/include/asm-x86/dma-mapping_64.h
similarity index 100%
rename from include/asm-x86_64/dma-mapping.h
rename to include/asm-x86/dma-mapping_64.h
diff --git a/include/asm-x86/dma.h b/include/asm-x86/dma.h
new file mode 100644
index 0000000000000..9f936c61a4e50
--- /dev/null
+++ b/include/asm-x86/dma.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "dma_32.h"
+#else
+# include "dma_64.h"
+#endif
diff --git a/include/asm-i386/dma.h b/include/asm-x86/dma_32.h
similarity index 100%
rename from include/asm-i386/dma.h
rename to include/asm-x86/dma_32.h
diff --git a/include/asm-x86_64/dma.h b/include/asm-x86/dma_64.h
similarity index 100%
rename from include/asm-x86_64/dma.h
rename to include/asm-x86/dma_64.h
diff --git a/include/asm-x86/dmi.h b/include/asm-x86/dmi.h
new file mode 100644
index 0000000000000..c9e4e8ebc2708
--- /dev/null
+++ b/include/asm-x86/dmi.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "dmi_32.h"
+#else
+# include "dmi_64.h"
+#endif
diff --git a/include/asm-i386/dmi.h b/include/asm-x86/dmi_32.h
similarity index 100%
rename from include/asm-i386/dmi.h
rename to include/asm-x86/dmi_32.h
diff --git a/include/asm-x86_64/dmi.h b/include/asm-x86/dmi_64.h
similarity index 100%
rename from include/asm-x86_64/dmi.h
rename to include/asm-x86/dmi_64.h
diff --git a/include/asm-x86/dwarf2.h b/include/asm-x86/dwarf2.h
new file mode 100644
index 0000000000000..b3cbb0ccae18d
--- /dev/null
+++ b/include/asm-x86/dwarf2.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "dwarf2_32.h"
+#else
+# include "dwarf2_64.h"
+#endif
diff --git a/include/asm-i386/dwarf2.h b/include/asm-x86/dwarf2_32.h
similarity index 100%
rename from include/asm-i386/dwarf2.h
rename to include/asm-x86/dwarf2_32.h
diff --git a/include/asm-x86_64/dwarf2.h b/include/asm-x86/dwarf2_64.h
similarity index 100%
rename from include/asm-x86_64/dwarf2.h
rename to include/asm-x86/dwarf2_64.h
diff --git a/include/asm-x86/e820.h b/include/asm-x86/e820.h
new file mode 100644
index 0000000000000..5d4d2183e5db5
--- /dev/null
+++ b/include/asm-x86/e820.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "e820_32.h"
+#else
+# include "e820_64.h"
+#endif
diff --git a/include/asm-i386/e820.h b/include/asm-x86/e820_32.h
similarity index 100%
rename from include/asm-i386/e820.h
rename to include/asm-x86/e820_32.h
diff --git a/include/asm-x86_64/e820.h b/include/asm-x86/e820_64.h
similarity index 100%
rename from include/asm-x86_64/e820.h
rename to include/asm-x86/e820_64.h
diff --git a/include/asm-x86/edac.h b/include/asm-x86/edac.h
new file mode 100644
index 0000000000000..f8b888e140b0c
--- /dev/null
+++ b/include/asm-x86/edac.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "edac_32.h"
+#else
+# include "edac_64.h"
+#endif
diff --git a/include/asm-i386/edac.h b/include/asm-x86/edac_32.h
similarity index 100%
rename from include/asm-i386/edac.h
rename to include/asm-x86/edac_32.h
diff --git a/include/asm-x86_64/edac.h b/include/asm-x86/edac_64.h
similarity index 100%
rename from include/asm-x86_64/edac.h
rename to include/asm-x86/edac_64.h
diff --git a/include/asm-x86/elf.h b/include/asm-x86/elf.h
new file mode 100644
index 0000000000000..ed6bb6e546b9f
--- /dev/null
+++ b/include/asm-x86/elf.h
@@ -0,0 +1,13 @@
+#ifdef __KERNEL__
+# ifdef CONFIG_X86_32
+# include "elf_32.h"
+# else
+# include "elf_64.h"
+# endif
+#else
+# ifdef __i386__
+# include "elf_32.h"
+# else
+# include "elf_64.h"
+# endif
+#endif
diff --git a/include/asm-i386/elf.h b/include/asm-x86/elf_32.h
similarity index 100%
rename from include/asm-i386/elf.h
rename to include/asm-x86/elf_32.h
diff --git a/include/asm-x86_64/elf.h b/include/asm-x86/elf_64.h
similarity index 100%
rename from include/asm-x86_64/elf.h
rename to include/asm-x86/elf_64.h
diff --git a/include/asm-i386/emergency-restart.h b/include/asm-x86/emergency-restart.h
similarity index 100%
rename from include/asm-i386/emergency-restart.h
rename to include/asm-x86/emergency-restart.h
diff --git a/include/asm-x86/errno.h b/include/asm-x86/errno.h
new file mode 100644
index 0000000000000..9d511be8e573d
--- /dev/null
+++ b/include/asm-x86/errno.h
@@ -0,0 +1,13 @@
+#ifdef __KERNEL__
+# ifdef CONFIG_X86_32
+# include "errno_32.h"
+# else
+# include "errno_64.h"
+# endif
+#else
+# ifdef __i386__
+# include "errno_32.h"
+# else
+# include "errno_64.h"
+# endif
+#endif
diff --git a/include/asm-i386/errno.h b/include/asm-x86/errno_32.h
similarity index 100%
rename from include/asm-i386/errno.h
rename to include/asm-x86/errno_32.h
diff --git a/include/asm-x86_64/errno.h b/include/asm-x86/errno_64.h
similarity index 100%
rename from include/asm-x86_64/errno.h
rename to include/asm-x86/errno_64.h
diff --git a/include/asm-x86/fb.h b/include/asm-x86/fb.h
new file mode 100644
index 0000000000000..238c7ca458776
--- /dev/null
+++ b/include/asm-x86/fb.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "fb_32.h"
+#else
+# include "fb_64.h"
+#endif
diff --git a/include/asm-i386/fb.h b/include/asm-x86/fb_32.h
similarity index 100%
rename from include/asm-i386/fb.h
rename to include/asm-x86/fb_32.h
diff --git a/include/asm-x86_64/fb.h b/include/asm-x86/fb_64.h
similarity index 100%
rename from include/asm-x86_64/fb.h
rename to include/asm-x86/fb_64.h
diff --git a/include/asm-i386/fcntl.h b/include/asm-x86/fcntl.h
similarity index 100%
rename from include/asm-i386/fcntl.h
rename to include/asm-x86/fcntl.h
diff --git a/include/asm-x86/fixmap.h b/include/asm-x86/fixmap.h
new file mode 100644
index 0000000000000..382eb271a8920
--- /dev/null
+++ b/include/asm-x86/fixmap.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "fixmap_32.h"
+#else
+# include "fixmap_64.h"
+#endif
diff --git a/include/asm-i386/fixmap.h b/include/asm-x86/fixmap_32.h
similarity index 100%
rename from include/asm-i386/fixmap.h
rename to include/asm-x86/fixmap_32.h
diff --git a/include/asm-x86_64/fixmap.h b/include/asm-x86/fixmap_64.h
similarity index 100%
rename from include/asm-x86_64/fixmap.h
rename to include/asm-x86/fixmap_64.h
diff --git a/include/asm-x86/floppy.h b/include/asm-x86/floppy.h
new file mode 100644
index 0000000000000..aecbb6dca21df
--- /dev/null
+++ b/include/asm-x86/floppy.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "floppy_32.h"
+#else
+# include "floppy_64.h"
+#endif
diff --git a/include/asm-i386/floppy.h b/include/asm-x86/floppy_32.h
similarity index 100%
rename from include/asm-i386/floppy.h
rename to include/asm-x86/floppy_32.h
diff --git a/include/asm-x86_64/floppy.h b/include/asm-x86/floppy_64.h
similarity index 100%
rename from include/asm-x86_64/floppy.h
rename to include/asm-x86/floppy_64.h
diff --git a/include/asm-x86_64/fpu32.h b/include/asm-x86/fpu32.h
similarity index 100%
rename from include/asm-x86_64/fpu32.h
rename to include/asm-x86/fpu32.h
diff --git a/include/asm-i386/frame.i b/include/asm-x86/frame.i
similarity index 100%
rename from include/asm-i386/frame.i
rename to include/asm-x86/frame.i
diff --git a/include/asm-x86/futex.h b/include/asm-x86/futex.h
new file mode 100644
index 0000000000000..1f4610e0c6130
--- /dev/null
+++ b/include/asm-x86/futex.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "futex_32.h"
+#else
+# include "futex_64.h"
+#endif
diff --git a/include/asm-i386/futex.h b/include/asm-x86/futex_32.h
similarity index 100%
rename from include/asm-i386/futex.h
rename to include/asm-x86/futex_32.h
diff --git a/include/asm-x86_64/futex.h b/include/asm-x86/futex_64.h
similarity index 100%
rename from include/asm-x86_64/futex.h
rename to include/asm-x86/futex_64.h
diff --git a/include/asm-x86/genapic.h b/include/asm-x86/genapic.h
new file mode 100644
index 0000000000000..d48bee663a6fa
--- /dev/null
+++ b/include/asm-x86/genapic.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "genapic_32.h"
+#else
+# include "genapic_64.h"
+#endif
diff --git a/include/asm-i386/genapic.h b/include/asm-x86/genapic_32.h
similarity index 100%
rename from include/asm-i386/genapic.h
rename to include/asm-x86/genapic_32.h
diff --git a/include/asm-x86_64/genapic.h b/include/asm-x86/genapic_64.h
similarity index 100%
rename from include/asm-x86_64/genapic.h
rename to include/asm-x86/genapic_64.h
diff --git a/include/asm-i386/geode.h b/include/asm-x86/geode.h
similarity index 100%
rename from include/asm-i386/geode.h
rename to include/asm-x86/geode.h
diff --git a/include/asm-x86/hardirq.h b/include/asm-x86/hardirq.h
new file mode 100644
index 0000000000000..314434d664e78
--- /dev/null
+++ b/include/asm-x86/hardirq.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "hardirq_32.h"
+#else
+# include "hardirq_64.h"
+#endif
diff --git a/include/asm-i386/hardirq.h b/include/asm-x86/hardirq_32.h
similarity index 100%
rename from include/asm-i386/hardirq.h
rename to include/asm-x86/hardirq_32.h
diff --git a/include/asm-x86_64/hardirq.h b/include/asm-x86/hardirq_64.h
similarity index 100%
rename from include/asm-x86_64/hardirq.h
rename to include/asm-x86/hardirq_64.h
diff --git a/include/asm-i386/highmem.h b/include/asm-x86/highmem.h
similarity index 100%
rename from include/asm-i386/highmem.h
rename to include/asm-x86/highmem.h
diff --git a/include/asm-x86/hpet.h b/include/asm-x86/hpet.h
new file mode 100644
index 0000000000000..9eff48601254a
--- /dev/null
+++ b/include/asm-x86/hpet.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "hpet_32.h"
+#else
+# include "hpet_64.h"
+#endif
diff --git a/include/asm-i386/hpet.h b/include/asm-x86/hpet_32.h
similarity index 100%
rename from include/asm-i386/hpet.h
rename to include/asm-x86/hpet_32.h
diff --git a/include/asm-x86_64/hpet.h b/include/asm-x86/hpet_64.h
similarity index 93%
rename from include/asm-x86_64/hpet.h
rename to include/asm-x86/hpet_64.h
index 79bb950f82c5d..fd4decac93a8e 100644
--- a/include/asm-x86_64/hpet.h
+++ b/include/asm-x86/hpet_64.h
@@ -1,7 +1,7 @@
#ifndef _ASM_X8664_HPET_H
#define _ASM_X8664_HPET_H 1
-#include <asm-i386/hpet.h>
+#include <asm/hpet_32.h>
#define HPET_TICK_RATE (HZ * 100000UL)
diff --git a/include/asm-x86/hw_irq.h b/include/asm-x86/hw_irq.h
new file mode 100644
index 0000000000000..bf025399d9392
--- /dev/null
+++ b/include/asm-x86/hw_irq.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "hw_irq_32.h"
+#else
+# include "hw_irq_64.h"
+#endif
diff --git a/include/asm-i386/hw_irq.h b/include/asm-x86/hw_irq_32.h
similarity index 100%
rename from include/asm-i386/hw_irq.h
rename to include/asm-x86/hw_irq_32.h
diff --git a/include/asm-x86_64/hw_irq.h b/include/asm-x86/hw_irq_64.h
similarity index 100%
rename from include/asm-x86_64/hw_irq.h
rename to include/asm-x86/hw_irq_64.h
diff --git a/include/asm-i386/hypertransport.h b/include/asm-x86/hypertransport.h
similarity index 100%
rename from include/asm-i386/hypertransport.h
rename to include/asm-x86/hypertransport.h
diff --git a/include/asm-x86/i387.h b/include/asm-x86/i387.h
new file mode 100644
index 0000000000000..a8bbed3496648
--- /dev/null
+++ b/include/asm-x86/i387.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "i387_32.h"
+#else
+# include "i387_64.h"
+#endif
diff --git a/include/asm-i386/i387.h b/include/asm-x86/i387_32.h
similarity index 100%
rename from include/asm-i386/i387.h
rename to include/asm-x86/i387_32.h
diff --git a/include/asm-x86_64/i387.h b/include/asm-x86/i387_64.h
similarity index 100%
rename from include/asm-x86_64/i387.h
rename to include/asm-x86/i387_64.h
diff --git a/include/asm-x86/i8253.h b/include/asm-x86/i8253.h
new file mode 100644
index 0000000000000..b2a4f995a33f9
--- /dev/null
+++ b/include/asm-x86/i8253.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "i8253_32.h"
+#else
+# include "i8253_64.h"
+#endif
diff --git a/include/asm-i386/i8253.h b/include/asm-x86/i8253_32.h
similarity index 100%
rename from include/asm-i386/i8253.h
rename to include/asm-x86/i8253_32.h
diff --git a/include/asm-x86_64/i8253.h b/include/asm-x86/i8253_64.h
similarity index 100%
rename from include/asm-x86_64/i8253.h
rename to include/asm-x86/i8253_64.h
diff --git a/include/asm-i386/i8259.h b/include/asm-x86/i8259.h
similarity index 100%
rename from include/asm-i386/i8259.h
rename to include/asm-x86/i8259.h
diff --git a/include/asm-x86_64/ia32.h b/include/asm-x86/ia32.h
similarity index 100%
rename from include/asm-x86_64/ia32.h
rename to include/asm-x86/ia32.h
diff --git a/include/asm-x86_64/ia32_unistd.h b/include/asm-x86/ia32_unistd.h
similarity index 100%
rename from include/asm-x86_64/ia32_unistd.h
rename to include/asm-x86/ia32_unistd.h
diff --git a/include/asm-i386/ide.h b/include/asm-x86/ide.h
similarity index 100%
rename from include/asm-i386/ide.h
rename to include/asm-x86/ide.h
diff --git a/include/asm-x86_64/idle.h b/include/asm-x86/idle.h
similarity index 100%
rename from include/asm-x86_64/idle.h
rename to include/asm-x86/idle.h
diff --git a/include/asm-x86/intel_arch_perfmon.h b/include/asm-x86/intel_arch_perfmon.h
new file mode 100644
index 0000000000000..4f6d4e6bf57e4
--- /dev/null
+++ b/include/asm-x86/intel_arch_perfmon.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "intel_arch_perfmon_32.h"
+#else
+# include "intel_arch_perfmon_64.h"
+#endif
diff --git a/include/asm-i386/intel_arch_perfmon.h b/include/asm-x86/intel_arch_perfmon_32.h
similarity index 100%
rename from include/asm-i386/intel_arch_perfmon.h
rename to include/asm-x86/intel_arch_perfmon_32.h
diff --git a/include/asm-x86_64/intel_arch_perfmon.h b/include/asm-x86/intel_arch_perfmon_64.h
similarity index 100%
rename from include/asm-x86_64/intel_arch_perfmon.h
rename to include/asm-x86/intel_arch_perfmon_64.h
diff --git a/include/asm-x86/io.h b/include/asm-x86/io.h
new file mode 100644
index 0000000000000..5a58b176dd612
--- /dev/null
+++ b/include/asm-x86/io.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "io_32.h"
+#else
+# include "io_64.h"
+#endif
diff --git a/include/asm-i386/io.h b/include/asm-x86/io_32.h
similarity index 100%
rename from include/asm-i386/io.h
rename to include/asm-x86/io_32.h
diff --git a/include/asm-x86_64/io.h b/include/asm-x86/io_64.h
similarity index 100%
rename from include/asm-x86_64/io.h
rename to include/asm-x86/io_64.h
diff --git a/include/asm-x86/io_apic.h b/include/asm-x86/io_apic.h
new file mode 100644
index 0000000000000..88494966beeb5
--- /dev/null
+++ b/include/asm-x86/io_apic.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "io_apic_32.h"
+#else
+# include "io_apic_64.h"
+#endif
diff --git a/include/asm-i386/io_apic.h b/include/asm-x86/io_apic_32.h
similarity index 100%
rename from include/asm-i386/io_apic.h
rename to include/asm-x86/io_apic_32.h
diff --git a/include/asm-x86_64/io_apic.h b/include/asm-x86/io_apic_64.h
similarity index 100%
rename from include/asm-x86_64/io_apic.h
rename to include/asm-x86/io_apic_64.h
diff --git a/include/asm-i386/ioctl.h b/include/asm-x86/ioctl.h
similarity index 100%
rename from include/asm-i386/ioctl.h
rename to include/asm-x86/ioctl.h
diff --git a/include/asm-x86/ioctls.h b/include/asm-x86/ioctls.h
new file mode 100644
index 0000000000000..1e0fd48f18bc9
--- /dev/null
+++ b/include/asm-x86/ioctls.h
@@ -0,0 +1,13 @@
+#ifdef __KERNEL__
+# ifdef CONFIG_X86_32
+# include "ioctls_32.h"
+# else
+# include "ioctls_64.h"
+# endif
+#else
+# ifdef __i386__
+# include "ioctls_32.h"
+# else
+# include "ioctls_64.h"
+# endif
+#endif
diff --git a/include/asm-i386/ioctls.h b/include/asm-x86/ioctls_32.h
similarity index 100%
rename from include/asm-i386/ioctls.h
rename to include/asm-x86/ioctls_32.h
diff --git a/include/asm-x86_64/ioctls.h b/include/asm-x86/ioctls_64.h
similarity index 100%
rename from include/asm-x86_64/ioctls.h
rename to include/asm-x86/ioctls_64.h
diff --git a/include/asm-x86_64/iommu.h b/include/asm-x86/iommu.h
similarity index 100%
rename from include/asm-x86_64/iommu.h
rename to include/asm-x86/iommu.h
diff --git a/include/asm-i386/ipc.h b/include/asm-x86/ipc.h
similarity index 100%
rename from include/asm-i386/ipc.h
rename to include/asm-x86/ipc.h
diff --git a/include/asm-x86/ipcbuf.h b/include/asm-x86/ipcbuf.h
new file mode 100644
index 0000000000000..eb2e448c6e28f
--- /dev/null
+++ b/include/asm-x86/ipcbuf.h
@@ -0,0 +1,13 @@
+#ifdef __KERNEL__
+# ifdef CONFIG_X86_32
+# include "ipcbuf_32.h"
+# else
+# include "ipcbuf_64.h"
+# endif
+#else
+# ifdef __i386__
+# include "ipcbuf_32.h"
+# else
+# include "ipcbuf_64.h"
+# endif
+#endif
diff --git a/include/asm-i386/ipcbuf.h b/include/asm-x86/ipcbuf_32.h
similarity index 100%
rename from include/asm-i386/ipcbuf.h
rename to include/asm-x86/ipcbuf_32.h
diff --git a/include/asm-x86_64/ipcbuf.h b/include/asm-x86/ipcbuf_64.h
similarity index 100%
rename from include/asm-x86_64/ipcbuf.h
rename to include/asm-x86/ipcbuf_64.h
diff --git a/include/asm-x86_64/ipi.h b/include/asm-x86/ipi.h
similarity index 100%
rename from include/asm-x86_64/ipi.h
rename to include/asm-x86/ipi.h
diff --git a/include/asm-x86/irq.h b/include/asm-x86/irq.h
new file mode 100644
index 0000000000000..7ba905465a53e
--- /dev/null
+++ b/include/asm-x86/irq.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "irq_32.h"
+#else
+# include "irq_64.h"
+#endif
diff --git a/include/asm-i386/irq.h b/include/asm-x86/irq_32.h
similarity index 100%
rename from include/asm-i386/irq.h
rename to include/asm-x86/irq_32.h
diff --git a/include/asm-x86_64/irq.h b/include/asm-x86/irq_64.h
similarity index 100%
rename from include/asm-x86_64/irq.h
rename to include/asm-x86/irq_64.h
diff --git a/include/asm-x86/irq_regs.h b/include/asm-x86/irq_regs.h
new file mode 100644
index 0000000000000..89c898ab298b3
--- /dev/null
+++ b/include/asm-x86/irq_regs.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "irq_regs_32.h"
+#else
+# include "irq_regs_64.h"
+#endif
diff --git a/include/asm-i386/irq_regs.h b/include/asm-x86/irq_regs_32.h
similarity index 100%
rename from include/asm-i386/irq_regs.h
rename to include/asm-x86/irq_regs_32.h
diff --git a/include/asm-x86_64/irq_regs.h b/include/asm-x86/irq_regs_64.h
similarity index 100%
rename from include/asm-x86_64/irq_regs.h
rename to include/asm-x86/irq_regs_64.h
diff --git a/include/asm-x86/irqflags.h b/include/asm-x86/irqflags.h
new file mode 100644
index 0000000000000..1b695ff52687f
--- /dev/null
+++ b/include/asm-x86/irqflags.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "irqflags_32.h"
+#else
+# include "irqflags_64.h"
+#endif
diff --git a/include/asm-i386/irqflags.h b/include/asm-x86/irqflags_32.h
similarity index 100%
rename from include/asm-i386/irqflags.h
rename to include/asm-x86/irqflags_32.h
diff --git a/include/asm-x86_64/irqflags.h b/include/asm-x86/irqflags_64.h
similarity index 100%
rename from include/asm-x86_64/irqflags.h
rename to include/asm-x86/irqflags_64.h
diff --git a/include/asm-i386/ist.h b/include/asm-x86/ist.h
similarity index 100%
rename from include/asm-i386/ist.h
rename to include/asm-x86/ist.h
diff --git a/include/asm-x86_64/k8.h b/include/asm-x86/k8.h
similarity index 100%
rename from include/asm-x86_64/k8.h
rename to include/asm-x86/k8.h
diff --git a/include/asm-x86/kdebug.h b/include/asm-x86/kdebug.h
new file mode 100644
index 0000000000000..38479106c2594
--- /dev/null
+++ b/include/asm-x86/kdebug.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "kdebug_32.h"
+#else
+# include "kdebug_64.h"
+#endif
diff --git a/include/asm-i386/kdebug.h b/include/asm-x86/kdebug_32.h
similarity index 100%
rename from include/asm-i386/kdebug.h
rename to include/asm-x86/kdebug_32.h
diff --git a/include/asm-x86_64/kdebug.h b/include/asm-x86/kdebug_64.h
similarity index 100%
rename from include/asm-x86_64/kdebug.h
rename to include/asm-x86/kdebug_64.h
diff --git a/include/asm-x86/kexec.h b/include/asm-x86/kexec.h
new file mode 100644
index 0000000000000..718ddbfb95163
--- /dev/null
+++ b/include/asm-x86/kexec.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "kexec_32.h"
+#else
+# include "kexec_64.h"
+#endif
diff --git a/include/asm-i386/kexec.h b/include/asm-x86/kexec_32.h
similarity index 100%
rename from include/asm-i386/kexec.h
rename to include/asm-x86/kexec_32.h
diff --git a/include/asm-x86_64/kexec.h b/include/asm-x86/kexec_64.h
similarity index 100%
rename from include/asm-x86_64/kexec.h
rename to include/asm-x86/kexec_64.h
diff --git a/include/asm-x86/kmap_types.h b/include/asm-x86/kmap_types.h
new file mode 100644
index 0000000000000..e4ec724b298e3
--- /dev/null
+++ b/include/asm-x86/kmap_types.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "kmap_types_32.h"
+#else
+# include "kmap_types_64.h"
+#endif
diff --git a/include/asm-i386/kmap_types.h b/include/asm-x86/kmap_types_32.h
similarity index 100%
rename from include/asm-i386/kmap_types.h
rename to include/asm-x86/kmap_types_32.h
diff --git a/include/asm-x86_64/kmap_types.h b/include/asm-x86/kmap_types_64.h
similarity index 100%
rename from include/asm-x86_64/kmap_types.h
rename to include/asm-x86/kmap_types_64.h
diff --git a/include/asm-x86/kprobes.h b/include/asm-x86/kprobes.h
new file mode 100644
index 0000000000000..b7bbd25ba2a67
--- /dev/null
+++ b/include/asm-x86/kprobes.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "kprobes_32.h"
+#else
+# include "kprobes_64.h"
+#endif
diff --git a/include/asm-i386/kprobes.h b/include/asm-x86/kprobes_32.h
similarity index 100%
rename from include/asm-i386/kprobes.h
rename to include/asm-x86/kprobes_32.h
diff --git a/include/asm-x86_64/kprobes.h b/include/asm-x86/kprobes_64.h
similarity index 100%
rename from include/asm-x86_64/kprobes.h
rename to include/asm-x86/kprobes_64.h
diff --git a/include/asm-x86/ldt.h b/include/asm-x86/ldt.h
new file mode 100644
index 0000000000000..3d9cc20d2ba43
--- /dev/null
+++ b/include/asm-x86/ldt.h
@@ -0,0 +1,13 @@
+#ifdef __KERNEL__
+# ifdef CONFIG_X86_32
+# include "ldt_32.h"
+# else
+# include "ldt_64.h"
+# endif
+#else
+# ifdef __i386__
+# include "ldt_32.h"
+# else
+# include "ldt_64.h"
+# endif
+#endif
diff --git a/include/asm-i386/ldt.h b/include/asm-x86/ldt_32.h
similarity index 100%
rename from include/asm-i386/ldt.h
rename to include/asm-x86/ldt_32.h
diff --git a/include/asm-x86_64/ldt.h b/include/asm-x86/ldt_64.h
similarity index 100%
rename from include/asm-x86_64/ldt.h
rename to include/asm-x86/ldt_64.h
diff --git a/include/asm-x86/linkage.h b/include/asm-x86/linkage.h
new file mode 100644
index 0000000000000..94b257fa87019
--- /dev/null
+++ b/include/asm-x86/linkage.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "linkage_32.h"
+#else
+# include "linkage_64.h"
+#endif
diff --git a/include/asm-i386/linkage.h b/include/asm-x86/linkage_32.h
similarity index 100%
rename from include/asm-i386/linkage.h
rename to include/asm-x86/linkage_32.h
diff --git a/include/asm-x86_64/linkage.h b/include/asm-x86/linkage_64.h
similarity index 100%
rename from include/asm-x86_64/linkage.h
rename to include/asm-x86/linkage_64.h
diff --git a/include/asm-x86/local.h b/include/asm-x86/local.h
new file mode 100644
index 0000000000000..c7a1b1c66c963
--- /dev/null
+++ b/include/asm-x86/local.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "local_32.h"
+#else
+# include "local_64.h"
+#endif
diff --git a/include/asm-i386/local.h b/include/asm-x86/local_32.h
similarity index 100%
rename from include/asm-i386/local.h
rename to include/asm-x86/local_32.h
diff --git a/include/asm-x86_64/local.h b/include/asm-x86/local_64.h
similarity index 100%
rename from include/asm-x86_64/local.h
rename to include/asm-x86/local_64.h
diff --git a/include/asm-i386/mach-bigsmp/mach_apic.h b/include/asm-x86/mach-bigsmp/mach_apic.h
similarity index 100%
rename from include/asm-i386/mach-bigsmp/mach_apic.h
rename to include/asm-x86/mach-bigsmp/mach_apic.h
diff --git a/include/asm-i386/mach-bigsmp/mach_apicdef.h b/include/asm-x86/mach-bigsmp/mach_apicdef.h
similarity index 100%
rename from include/asm-i386/mach-bigsmp/mach_apicdef.h
rename to include/asm-x86/mach-bigsmp/mach_apicdef.h
diff --git a/include/asm-i386/mach-bigsmp/mach_ipi.h b/include/asm-x86/mach-bigsmp/mach_ipi.h
similarity index 100%
rename from include/asm-i386/mach-bigsmp/mach_ipi.h
rename to include/asm-x86/mach-bigsmp/mach_ipi.h
diff --git a/include/asm-i386/mach-bigsmp/mach_mpspec.h b/include/asm-x86/mach-bigsmp/mach_mpspec.h
similarity index 100%
rename from include/asm-i386/mach-bigsmp/mach_mpspec.h
rename to include/asm-x86/mach-bigsmp/mach_mpspec.h
diff --git a/include/asm-i386/mach-default/apm.h b/include/asm-x86/mach-default/apm.h
similarity index 100%
rename from include/asm-i386/mach-default/apm.h
rename to include/asm-x86/mach-default/apm.h
diff --git a/include/asm-i386/mach-default/bios_ebda.h b/include/asm-x86/mach-default/bios_ebda.h
similarity index 100%
rename from include/asm-i386/mach-default/bios_ebda.h
rename to include/asm-x86/mach-default/bios_ebda.h
diff --git a/include/asm-i386/mach-default/do_timer.h b/include/asm-x86/mach-default/do_timer.h
similarity index 100%
rename from include/asm-i386/mach-default/do_timer.h
rename to include/asm-x86/mach-default/do_timer.h
diff --git a/include/asm-i386/mach-default/entry_arch.h b/include/asm-x86/mach-default/entry_arch.h
similarity index 100%
rename from include/asm-i386/mach-default/entry_arch.h
rename to include/asm-x86/mach-default/entry_arch.h
diff --git a/include/asm-i386/mach-default/io_ports.h b/include/asm-x86/mach-default/io_ports.h
similarity index 100%
rename from include/asm-i386/mach-default/io_ports.h
rename to include/asm-x86/mach-default/io_ports.h
diff --git a/include/asm-i386/mach-default/irq_vectors.h b/include/asm-x86/mach-default/irq_vectors.h
similarity index 100%
rename from include/asm-i386/mach-default/irq_vectors.h
rename to include/asm-x86/mach-default/irq_vectors.h
diff --git a/include/asm-i386/mach-default/irq_vectors_limits.h b/include/asm-x86/mach-default/irq_vectors_limits.h
similarity index 100%
rename from include/asm-i386/mach-default/irq_vectors_limits.h
rename to include/asm-x86/mach-default/irq_vectors_limits.h
diff --git a/include/asm-i386/mach-default/mach_apic.h b/include/asm-x86/mach-default/mach_apic.h
similarity index 100%
rename from include/asm-i386/mach-default/mach_apic.h
rename to include/asm-x86/mach-default/mach_apic.h
diff --git a/include/asm-i386/mach-default/mach_apicdef.h b/include/asm-x86/mach-default/mach_apicdef.h
similarity index 100%
rename from include/asm-i386/mach-default/mach_apicdef.h
rename to include/asm-x86/mach-default/mach_apicdef.h
diff --git a/include/asm-i386/mach-default/mach_ipi.h b/include/asm-x86/mach-default/mach_ipi.h
similarity index 100%
rename from include/asm-i386/mach-default/mach_ipi.h
rename to include/asm-x86/mach-default/mach_ipi.h
diff --git a/include/asm-i386/mach-default/mach_mpparse.h b/include/asm-x86/mach-default/mach_mpparse.h
similarity index 100%
rename from include/asm-i386/mach-default/mach_mpparse.h
rename to include/asm-x86/mach-default/mach_mpparse.h
diff --git a/include/asm-i386/mach-default/mach_mpspec.h b/include/asm-x86/mach-default/mach_mpspec.h
similarity index 100%
rename from include/asm-i386/mach-default/mach_mpspec.h
rename to include/asm-x86/mach-default/mach_mpspec.h
diff --git a/include/asm-i386/mach-default/mach_reboot.h b/include/asm-x86/mach-default/mach_reboot.h
similarity index 100%
rename from include/asm-i386/mach-default/mach_reboot.h
rename to include/asm-x86/mach-default/mach_reboot.h
diff --git a/include/asm-i386/mach-default/mach_time.h b/include/asm-x86/mach-default/mach_time.h
similarity index 100%
rename from include/asm-i386/mach-default/mach_time.h
rename to include/asm-x86/mach-default/mach_time.h
diff --git a/include/asm-i386/mach-default/mach_timer.h b/include/asm-x86/mach-default/mach_timer.h
similarity index 100%
rename from include/asm-i386/mach-default/mach_timer.h
rename to include/asm-x86/mach-default/mach_timer.h
diff --git a/include/asm-i386/mach-default/mach_traps.h b/include/asm-x86/mach-default/mach_traps.h
similarity index 100%
rename from include/asm-i386/mach-default/mach_traps.h
rename to include/asm-x86/mach-default/mach_traps.h
diff --git a/include/asm-i386/mach-default/mach_wakecpu.h b/include/asm-x86/mach-default/mach_wakecpu.h
similarity index 100%
rename from include/asm-i386/mach-default/mach_wakecpu.h
rename to include/asm-x86/mach-default/mach_wakecpu.h
diff --git a/include/asm-i386/mach-default/pci-functions.h b/include/asm-x86/mach-default/pci-functions.h
similarity index 100%
rename from include/asm-i386/mach-default/pci-functions.h
rename to include/asm-x86/mach-default/pci-functions.h
diff --git a/include/asm-i386/mach-default/setup_arch.h b/include/asm-x86/mach-default/setup_arch.h
similarity index 100%
rename from include/asm-i386/mach-default/setup_arch.h
rename to include/asm-x86/mach-default/setup_arch.h
diff --git a/include/asm-i386/mach-default/smpboot_hooks.h b/include/asm-x86/mach-default/smpboot_hooks.h
similarity index 100%
rename from include/asm-i386/mach-default/smpboot_hooks.h
rename to include/asm-x86/mach-default/smpboot_hooks.h
diff --git a/include/asm-i386/mach-es7000/mach_apic.h b/include/asm-x86/mach-es7000/mach_apic.h
similarity index 100%
rename from include/asm-i386/mach-es7000/mach_apic.h
rename to include/asm-x86/mach-es7000/mach_apic.h
diff --git a/include/asm-i386/mach-es7000/mach_apicdef.h b/include/asm-x86/mach-es7000/mach_apicdef.h
similarity index 100%
rename from include/asm-i386/mach-es7000/mach_apicdef.h
rename to include/asm-x86/mach-es7000/mach_apicdef.h
diff --git a/include/asm-i386/mach-es7000/mach_ipi.h b/include/asm-x86/mach-es7000/mach_ipi.h
similarity index 100%
rename from include/asm-i386/mach-es7000/mach_ipi.h
rename to include/asm-x86/mach-es7000/mach_ipi.h
diff --git a/include/asm-i386/mach-es7000/mach_mpparse.h b/include/asm-x86/mach-es7000/mach_mpparse.h
similarity index 100%
rename from include/asm-i386/mach-es7000/mach_mpparse.h
rename to include/asm-x86/mach-es7000/mach_mpparse.h
diff --git a/include/asm-i386/mach-es7000/mach_mpspec.h b/include/asm-x86/mach-es7000/mach_mpspec.h
similarity index 100%
rename from include/asm-i386/mach-es7000/mach_mpspec.h
rename to include/asm-x86/mach-es7000/mach_mpspec.h
diff --git a/include/asm-i386/mach-es7000/mach_wakecpu.h b/include/asm-x86/mach-es7000/mach_wakecpu.h
similarity index 100%
rename from include/asm-i386/mach-es7000/mach_wakecpu.h
rename to include/asm-x86/mach-es7000/mach_wakecpu.h
diff --git a/include/asm-i386/mach-generic/irq_vectors_limits.h b/include/asm-x86/mach-generic/irq_vectors_limits.h
similarity index 100%
rename from include/asm-i386/mach-generic/irq_vectors_limits.h
rename to include/asm-x86/mach-generic/irq_vectors_limits.h
diff --git a/include/asm-i386/mach-generic/mach_apic.h b/include/asm-x86/mach-generic/mach_apic.h
similarity index 100%
rename from include/asm-i386/mach-generic/mach_apic.h
rename to include/asm-x86/mach-generic/mach_apic.h
diff --git a/include/asm-i386/mach-generic/mach_apicdef.h b/include/asm-x86/mach-generic/mach_apicdef.h
similarity index 100%
rename from include/asm-i386/mach-generic/mach_apicdef.h
rename to include/asm-x86/mach-generic/mach_apicdef.h
diff --git a/include/asm-i386/mach-generic/mach_ipi.h b/include/asm-x86/mach-generic/mach_ipi.h
similarity index 100%
rename from include/asm-i386/mach-generic/mach_ipi.h
rename to include/asm-x86/mach-generic/mach_ipi.h
diff --git a/include/asm-i386/mach-generic/mach_mpparse.h b/include/asm-x86/mach-generic/mach_mpparse.h
similarity index 100%
rename from include/asm-i386/mach-generic/mach_mpparse.h
rename to include/asm-x86/mach-generic/mach_mpparse.h
diff --git a/include/asm-i386/mach-generic/mach_mpspec.h b/include/asm-x86/mach-generic/mach_mpspec.h
similarity index 100%
rename from include/asm-i386/mach-generic/mach_mpspec.h
rename to include/asm-x86/mach-generic/mach_mpspec.h
diff --git a/include/asm-i386/mach-numaq/mach_apic.h b/include/asm-x86/mach-numaq/mach_apic.h
similarity index 100%
rename from include/asm-i386/mach-numaq/mach_apic.h
rename to include/asm-x86/mach-numaq/mach_apic.h
diff --git a/include/asm-i386/mach-numaq/mach_apicdef.h b/include/asm-x86/mach-numaq/mach_apicdef.h
similarity index 100%
rename from include/asm-i386/mach-numaq/mach_apicdef.h
rename to include/asm-x86/mach-numaq/mach_apicdef.h
diff --git a/include/asm-i386/mach-numaq/mach_ipi.h b/include/asm-x86/mach-numaq/mach_ipi.h
similarity index 100%
rename from include/asm-i386/mach-numaq/mach_ipi.h
rename to include/asm-x86/mach-numaq/mach_ipi.h
diff --git a/include/asm-i386/mach-numaq/mach_mpparse.h b/include/asm-x86/mach-numaq/mach_mpparse.h
similarity index 100%
rename from include/asm-i386/mach-numaq/mach_mpparse.h
rename to include/asm-x86/mach-numaq/mach_mpparse.h
diff --git a/include/asm-i386/mach-numaq/mach_mpspec.h b/include/asm-x86/mach-numaq/mach_mpspec.h
similarity index 100%
rename from include/asm-i386/mach-numaq/mach_mpspec.h
rename to include/asm-x86/mach-numaq/mach_mpspec.h
diff --git a/include/asm-i386/mach-numaq/mach_wakecpu.h b/include/asm-x86/mach-numaq/mach_wakecpu.h
similarity index 100%
rename from include/asm-i386/mach-numaq/mach_wakecpu.h
rename to include/asm-x86/mach-numaq/mach_wakecpu.h
diff --git a/include/asm-i386/mach-summit/irq_vectors_limits.h b/include/asm-x86/mach-summit/irq_vectors_limits.h
similarity index 100%
rename from include/asm-i386/mach-summit/irq_vectors_limits.h
rename to include/asm-x86/mach-summit/irq_vectors_limits.h
diff --git a/include/asm-i386/mach-summit/mach_apic.h b/include/asm-x86/mach-summit/mach_apic.h
similarity index 100%
rename from include/asm-i386/mach-summit/mach_apic.h
rename to include/asm-x86/mach-summit/mach_apic.h
diff --git a/include/asm-i386/mach-summit/mach_apicdef.h b/include/asm-x86/mach-summit/mach_apicdef.h
similarity index 100%
rename from include/asm-i386/mach-summit/mach_apicdef.h
rename to include/asm-x86/mach-summit/mach_apicdef.h
diff --git a/include/asm-i386/mach-summit/mach_ipi.h b/include/asm-x86/mach-summit/mach_ipi.h
similarity index 100%
rename from include/asm-i386/mach-summit/mach_ipi.h
rename to include/asm-x86/mach-summit/mach_ipi.h
diff --git a/include/asm-i386/mach-summit/mach_mpparse.h b/include/asm-x86/mach-summit/mach_mpparse.h
similarity index 100%
rename from include/asm-i386/mach-summit/mach_mpparse.h
rename to include/asm-x86/mach-summit/mach_mpparse.h
diff --git a/include/asm-i386/mach-summit/mach_mpspec.h b/include/asm-x86/mach-summit/mach_mpspec.h
similarity index 100%
rename from include/asm-i386/mach-summit/mach_mpspec.h
rename to include/asm-x86/mach-summit/mach_mpspec.h
diff --git a/include/asm-i386/mach-visws/cobalt.h b/include/asm-x86/mach-visws/cobalt.h
similarity index 100%
rename from include/asm-i386/mach-visws/cobalt.h
rename to include/asm-x86/mach-visws/cobalt.h
diff --git a/include/asm-i386/mach-visws/entry_arch.h b/include/asm-x86/mach-visws/entry_arch.h
similarity index 100%
rename from include/asm-i386/mach-visws/entry_arch.h
rename to include/asm-x86/mach-visws/entry_arch.h
diff --git a/include/asm-i386/mach-visws/irq_vectors.h b/include/asm-x86/mach-visws/irq_vectors.h
similarity index 100%
rename from include/asm-i386/mach-visws/irq_vectors.h
rename to include/asm-x86/mach-visws/irq_vectors.h
diff --git a/include/asm-i386/mach-visws/lithium.h b/include/asm-x86/mach-visws/lithium.h
similarity index 100%
rename from include/asm-i386/mach-visws/lithium.h
rename to include/asm-x86/mach-visws/lithium.h
diff --git a/include/asm-i386/mach-visws/mach_apic.h b/include/asm-x86/mach-visws/mach_apic.h
similarity index 100%
rename from include/asm-i386/mach-visws/mach_apic.h
rename to include/asm-x86/mach-visws/mach_apic.h
diff --git a/include/asm-i386/mach-visws/mach_apicdef.h b/include/asm-x86/mach-visws/mach_apicdef.h
similarity index 100%
rename from include/asm-i386/mach-visws/mach_apicdef.h
rename to include/asm-x86/mach-visws/mach_apicdef.h
diff --git a/include/asm-i386/mach-visws/piix4.h b/include/asm-x86/mach-visws/piix4.h
similarity index 100%
rename from include/asm-i386/mach-visws/piix4.h
rename to include/asm-x86/mach-visws/piix4.h
diff --git a/include/asm-i386/mach-visws/setup_arch.h b/include/asm-x86/mach-visws/setup_arch.h
similarity index 100%
rename from include/asm-i386/mach-visws/setup_arch.h
rename to include/asm-x86/mach-visws/setup_arch.h
diff --git a/include/asm-i386/mach-visws/smpboot_hooks.h b/include/asm-x86/mach-visws/smpboot_hooks.h
similarity index 100%
rename from include/asm-i386/mach-visws/smpboot_hooks.h
rename to include/asm-x86/mach-visws/smpboot_hooks.h
diff --git a/include/asm-i386/mach-voyager/do_timer.h b/include/asm-x86/mach-voyager/do_timer.h
similarity index 100%
rename from include/asm-i386/mach-voyager/do_timer.h
rename to include/asm-x86/mach-voyager/do_timer.h
diff --git a/include/asm-i386/mach-voyager/entry_arch.h b/include/asm-x86/mach-voyager/entry_arch.h
similarity index 100%
rename from include/asm-i386/mach-voyager/entry_arch.h
rename to include/asm-x86/mach-voyager/entry_arch.h
diff --git a/include/asm-i386/mach-voyager/irq_vectors.h b/include/asm-x86/mach-voyager/irq_vectors.h
similarity index 100%
rename from include/asm-i386/mach-voyager/irq_vectors.h
rename to include/asm-x86/mach-voyager/irq_vectors.h
diff --git a/include/asm-i386/mach-voyager/setup_arch.h b/include/asm-x86/mach-voyager/setup_arch.h
similarity index 100%
rename from include/asm-i386/mach-voyager/setup_arch.h
rename to include/asm-x86/mach-voyager/setup_arch.h
diff --git a/include/asm-x86_64/mach_apic.h b/include/asm-x86/mach_apic.h
similarity index 100%
rename from include/asm-x86_64/mach_apic.h
rename to include/asm-x86/mach_apic.h
diff --git a/include/asm-i386/math_emu.h b/include/asm-x86/math_emu.h
similarity index 100%
rename from include/asm-i386/math_emu.h
rename to include/asm-x86/math_emu.h
diff --git a/include/asm-x86/mc146818rtc.h b/include/asm-x86/mc146818rtc.h
new file mode 100644
index 0000000000000..5c2bb66caf177
--- /dev/null
+++ b/include/asm-x86/mc146818rtc.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "mc146818rtc_32.h"
+#else
+# include "mc146818rtc_64.h"
+#endif
diff --git a/include/asm-i386/mc146818rtc.h b/include/asm-x86/mc146818rtc_32.h
similarity index 100%
rename from include/asm-i386/mc146818rtc.h
rename to include/asm-x86/mc146818rtc_32.h
diff --git a/include/asm-x86_64/mc146818rtc.h b/include/asm-x86/mc146818rtc_64.h
similarity index 100%
rename from include/asm-x86_64/mc146818rtc.h
rename to include/asm-x86/mc146818rtc_64.h
diff --git a/include/asm-i386/mca.h b/include/asm-x86/mca.h
similarity index 100%
rename from include/asm-i386/mca.h
rename to include/asm-x86/mca.h
diff --git a/include/asm-i386/mca_dma.h b/include/asm-x86/mca_dma.h
similarity index 100%
rename from include/asm-i386/mca_dma.h
rename to include/asm-x86/mca_dma.h
diff --git a/include/asm-x86/mce.h b/include/asm-x86/mce.h
new file mode 100644
index 0000000000000..cc8ca389912e6
--- /dev/null
+++ b/include/asm-x86/mce.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "mce_32.h"
+#else
+# include "mce_64.h"
+#endif
diff --git a/include/asm-i386/mce.h b/include/asm-x86/mce_32.h
similarity index 100%
rename from include/asm-i386/mce.h
rename to include/asm-x86/mce_32.h
diff --git a/include/asm-x86_64/mce.h b/include/asm-x86/mce_64.h
similarity index 100%
rename from include/asm-x86_64/mce.h
rename to include/asm-x86/mce_64.h
diff --git a/include/asm-x86/mman.h b/include/asm-x86/mman.h
new file mode 100644
index 0000000000000..322db07e82c3b
--- /dev/null
+++ b/include/asm-x86/mman.h
@@ -0,0 +1,13 @@
+#ifdef __KERNEL__
+# ifdef CONFIG_X86_32
+# include "mman_32.h"
+# else
+# include "mman_64.h"
+# endif
+#else
+# ifdef __i386__
+# include "mman_32.h"
+# else
+# include "mman_64.h"
+# endif
+#endif
diff --git a/include/asm-i386/mman.h b/include/asm-x86/mman_32.h
similarity index 100%
rename from include/asm-i386/mman.h
rename to include/asm-x86/mman_32.h
diff --git a/include/asm-x86_64/mman.h b/include/asm-x86/mman_64.h
similarity index 100%
rename from include/asm-x86_64/mman.h
rename to include/asm-x86/mman_64.h
diff --git a/include/asm-x86_64/mmsegment.h b/include/asm-x86/mmsegment.h
similarity index 100%
rename from include/asm-x86_64/mmsegment.h
rename to include/asm-x86/mmsegment.h
diff --git a/include/asm-x86/mmu.h b/include/asm-x86/mmu.h
new file mode 100644
index 0000000000000..9c628cd70e23b
--- /dev/null
+++ b/include/asm-x86/mmu.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "mmu_32.h"
+#else
+# include "mmu_64.h"
+#endif
diff --git a/include/asm-i386/mmu.h b/include/asm-x86/mmu_32.h
similarity index 100%
rename from include/asm-i386/mmu.h
rename to include/asm-x86/mmu_32.h
diff --git a/include/asm-x86_64/mmu.h b/include/asm-x86/mmu_64.h
similarity index 100%
rename from include/asm-x86_64/mmu.h
rename to include/asm-x86/mmu_64.h
diff --git a/include/asm-x86/mmu_context.h b/include/asm-x86/mmu_context.h
new file mode 100644
index 0000000000000..6598450da6c64
--- /dev/null
+++ b/include/asm-x86/mmu_context.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "mmu_context_32.h"
+#else
+# include "mmu_context_64.h"
+#endif
diff --git a/include/asm-i386/mmu_context.h b/include/asm-x86/mmu_context_32.h
similarity index 100%
rename from include/asm-i386/mmu_context.h
rename to include/asm-x86/mmu_context_32.h
diff --git a/include/asm-x86_64/mmu_context.h b/include/asm-x86/mmu_context_64.h
similarity index 100%
rename from include/asm-x86_64/mmu_context.h
rename to include/asm-x86/mmu_context_64.h
diff --git a/include/asm-i386/mmx.h b/include/asm-x86/mmx.h
similarity index 100%
rename from include/asm-i386/mmx.h
rename to include/asm-x86/mmx.h
diff --git a/include/asm-x86/mmzone.h b/include/asm-x86/mmzone.h
new file mode 100644
index 0000000000000..64217ea16a360
--- /dev/null
+++ b/include/asm-x86/mmzone.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "mmzone_32.h"
+#else
+# include "mmzone_64.h"
+#endif
diff --git a/include/asm-i386/mmzone.h b/include/asm-x86/mmzone_32.h
similarity index 100%
rename from include/asm-i386/mmzone.h
rename to include/asm-x86/mmzone_32.h
diff --git a/include/asm-x86_64/mmzone.h b/include/asm-x86/mmzone_64.h
similarity index 100%
rename from include/asm-x86_64/mmzone.h
rename to include/asm-x86/mmzone_64.h
diff --git a/include/asm-x86/module.h b/include/asm-x86/module.h
new file mode 100644
index 0000000000000..2b2f18d8a5317
--- /dev/null
+++ b/include/asm-x86/module.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "module_32.h"
+#else
+# include "module_64.h"
+#endif
diff --git a/include/asm-i386/module.h b/include/asm-x86/module_32.h
similarity index 100%
rename from include/asm-i386/module.h
rename to include/asm-x86/module_32.h
diff --git a/include/asm-x86_64/module.h b/include/asm-x86/module_64.h
similarity index 100%
rename from include/asm-x86_64/module.h
rename to include/asm-x86/module_64.h
diff --git a/include/asm-x86/mpspec.h b/include/asm-x86/mpspec.h
new file mode 100644
index 0000000000000..8f268e8fd2e9d
--- /dev/null
+++ b/include/asm-x86/mpspec.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "mpspec_32.h"
+#else
+# include "mpspec_64.h"
+#endif
diff --git a/include/asm-i386/mpspec.h b/include/asm-x86/mpspec_32.h
similarity index 100%
rename from include/asm-i386/mpspec.h
rename to include/asm-x86/mpspec_32.h
diff --git a/include/asm-x86_64/mpspec.h b/include/asm-x86/mpspec_64.h
similarity index 100%
rename from include/asm-x86_64/mpspec.h
rename to include/asm-x86/mpspec_64.h
diff --git a/include/asm-i386/mpspec_def.h b/include/asm-x86/mpspec_def.h
similarity index 100%
rename from include/asm-i386/mpspec_def.h
rename to include/asm-x86/mpspec_def.h
diff --git a/include/asm-x86/msgbuf.h b/include/asm-x86/msgbuf.h
new file mode 100644
index 0000000000000..154f7d64e862d
--- /dev/null
+++ b/include/asm-x86/msgbuf.h
@@ -0,0 +1,13 @@
+#ifdef __KERNEL__
+# ifdef CONFIG_X86_32
+# include "msgbuf_32.h"
+# else
+# include "msgbuf_64.h"
+# endif
+#else
+# ifdef __i386__
+# include "msgbuf_32.h"
+# else
+# include "msgbuf_64.h"
+# endif
+#endif
diff --git a/include/asm-i386/msgbuf.h b/include/asm-x86/msgbuf_32.h
similarity index 100%
rename from include/asm-i386/msgbuf.h
rename to include/asm-x86/msgbuf_32.h
diff --git a/include/asm-x86_64/msgbuf.h b/include/asm-x86/msgbuf_64.h
similarity index 100%
rename from include/asm-x86_64/msgbuf.h
rename to include/asm-x86/msgbuf_64.h
diff --git a/include/asm-i386/msidef.h b/include/asm-x86/msidef.h
similarity index 100%
rename from include/asm-i386/msidef.h
rename to include/asm-x86/msidef.h
diff --git a/include/asm-i386/msr-index.h b/include/asm-x86/msr-index.h
similarity index 100%
rename from include/asm-i386/msr-index.h
rename to include/asm-x86/msr-index.h
diff --git a/include/asm-x86/msr.h b/include/asm-x86/msr.h
new file mode 100644
index 0000000000000..2f87ce0070022
--- /dev/null
+++ b/include/asm-x86/msr.h
@@ -0,0 +1,13 @@
+#ifdef __KERNEL__
+# ifdef CONFIG_X86_32
+# include "msr_32.h"
+# else
+# include "msr_64.h"
+# endif
+#else
+# ifdef __i386__
+# include "msr_32.h"
+# else
+# include "msr_64.h"
+# endif
+#endif
diff --git a/include/asm-i386/msr.h b/include/asm-x86/msr_32.h
similarity index 100%
rename from include/asm-i386/msr.h
rename to include/asm-x86/msr_32.h
diff --git a/include/asm-x86_64/msr.h b/include/asm-x86/msr_64.h
similarity index 100%
rename from include/asm-x86_64/msr.h
rename to include/asm-x86/msr_64.h
diff --git a/include/asm-x86/mtrr.h b/include/asm-x86/mtrr.h
new file mode 100644
index 0000000000000..34f633b3e00ce
--- /dev/null
+++ b/include/asm-x86/mtrr.h
@@ -0,0 +1,13 @@
+#ifdef __KERNEL__
+# ifdef CONFIG_X86_32
+# include "mtrr_32.h"
+# else
+# include "mtrr_64.h"
+# endif
+#else
+# ifdef __i386__
+# include "mtrr_32.h"
+# else
+# include "mtrr_64.h"
+# endif
+#endif
diff --git a/include/asm-i386/mtrr.h b/include/asm-x86/mtrr_32.h
similarity index 100%
rename from include/asm-i386/mtrr.h
rename to include/asm-x86/mtrr_32.h
diff --git a/include/asm-x86_64/mtrr.h b/include/asm-x86/mtrr_64.h
similarity index 100%
rename from include/asm-x86_64/mtrr.h
rename to include/asm-x86/mtrr_64.h
diff --git a/include/asm-x86/mutex.h b/include/asm-x86/mutex.h
new file mode 100644
index 0000000000000..a731b9c573a66
--- /dev/null
+++ b/include/asm-x86/mutex.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "mutex_32.h"
+#else
+# include "mutex_64.h"
+#endif
diff --git a/include/asm-i386/mutex.h b/include/asm-x86/mutex_32.h
similarity index 100%
rename from include/asm-i386/mutex.h
rename to include/asm-x86/mutex_32.h
diff --git a/include/asm-x86_64/mutex.h b/include/asm-x86/mutex_64.h
similarity index 100%
rename from include/asm-x86_64/mutex.h
rename to include/asm-x86/mutex_64.h
diff --git a/include/asm-x86/namei.h b/include/asm-x86/namei.h
new file mode 100644
index 0000000000000..732f8f0b3dcdf
--- /dev/null
+++ b/include/asm-x86/namei.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "namei_32.h"
+#else
+# include "namei_64.h"
+#endif
diff --git a/include/asm-i386/namei.h b/include/asm-x86/namei_32.h
similarity index 100%
rename from include/asm-i386/namei.h
rename to include/asm-x86/namei_32.h
diff --git a/include/asm-x86_64/namei.h b/include/asm-x86/namei_64.h
similarity index 100%
rename from include/asm-x86_64/namei.h
rename to include/asm-x86/namei_64.h
diff --git a/include/asm-x86/nmi.h b/include/asm-x86/nmi.h
new file mode 100644
index 0000000000000..53ccac14cead0
--- /dev/null
+++ b/include/asm-x86/nmi.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "nmi_32.h"
+#else
+# include "nmi_64.h"
+#endif
diff --git a/include/asm-i386/nmi.h b/include/asm-x86/nmi_32.h
similarity index 100%
rename from include/asm-i386/nmi.h
rename to include/asm-x86/nmi_32.h
diff --git a/include/asm-x86_64/nmi.h b/include/asm-x86/nmi_64.h
similarity index 100%
rename from include/asm-x86_64/nmi.h
rename to include/asm-x86/nmi_64.h
diff --git a/include/asm-x86/numa.h b/include/asm-x86/numa.h
new file mode 100644
index 0000000000000..27da400d3138c
--- /dev/null
+++ b/include/asm-x86/numa.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "numa_32.h"
+#else
+# include "numa_64.h"
+#endif
diff --git a/include/asm-i386/numa.h b/include/asm-x86/numa_32.h
similarity index 100%
rename from include/asm-i386/numa.h
rename to include/asm-x86/numa_32.h
diff --git a/include/asm-x86_64/numa.h b/include/asm-x86/numa_64.h
similarity index 100%
rename from include/asm-x86_64/numa.h
rename to include/asm-x86/numa_64.h
diff --git a/include/asm-i386/numaq.h b/include/asm-x86/numaq.h
similarity index 100%
rename from include/asm-i386/numaq.h
rename to include/asm-x86/numaq.h
diff --git a/include/asm-x86/page.h b/include/asm-x86/page.h
new file mode 100644
index 0000000000000..a757eb26141d6
--- /dev/null
+++ b/include/asm-x86/page.h
@@ -0,0 +1,13 @@
+#ifdef __KERNEL__
+# ifdef CONFIG_X86_32
+# include "page_32.h"
+# else
+# include "page_64.h"
+# endif
+#else
+# ifdef __i386__
+# include "page_32.h"
+# else
+# include "page_64.h"
+# endif
+#endif
diff --git a/include/asm-i386/page.h b/include/asm-x86/page_32.h
similarity index 100%
rename from include/asm-i386/page.h
rename to include/asm-x86/page_32.h
diff --git a/include/asm-x86_64/page.h b/include/asm-x86/page_64.h
similarity index 100%
rename from include/asm-x86_64/page.h
rename to include/asm-x86/page_64.h
diff --git a/include/asm-x86/param.h b/include/asm-x86/param.h
new file mode 100644
index 0000000000000..640851bab124e
--- /dev/null
+++ b/include/asm-x86/param.h
@@ -0,0 +1,13 @@
+#ifdef __KERNEL__
+# ifdef CONFIG_X86_32
+# include "param_32.h"
+# else
+# include "param_64.h"
+# endif
+#else
+# ifdef __i386__
+# include "param_32.h"
+# else
+# include "param_64.h"
+# endif
+#endif
diff --git a/include/asm-i386/param.h b/include/asm-x86/param_32.h
similarity index 100%
rename from include/asm-i386/param.h
rename to include/asm-x86/param_32.h
diff --git a/include/asm-x86_64/param.h b/include/asm-x86/param_64.h
similarity index 100%
rename from include/asm-x86_64/param.h
rename to include/asm-x86/param_64.h
diff --git a/include/asm-i386/paravirt.h b/include/asm-x86/paravirt.h
similarity index 100%
rename from include/asm-i386/paravirt.h
rename to include/asm-x86/paravirt.h
diff --git a/include/asm-x86/parport.h b/include/asm-x86/parport.h
new file mode 100644
index 0000000000000..2a31157349c92
--- /dev/null
+++ b/include/asm-x86/parport.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "parport_32.h"
+#else
+# include "parport_64.h"
+#endif
diff --git a/include/asm-i386/parport.h b/include/asm-x86/parport_32.h
similarity index 100%
rename from include/asm-i386/parport.h
rename to include/asm-x86/parport_32.h
diff --git a/include/asm-x86_64/parport.h b/include/asm-x86/parport_64.h
similarity index 100%
rename from include/asm-x86_64/parport.h
rename to include/asm-x86/parport_64.h
diff --git a/include/asm-x86_64/pci-direct.h b/include/asm-x86/pci-direct.h
similarity index 100%
rename from include/asm-x86_64/pci-direct.h
rename to include/asm-x86/pci-direct.h
diff --git a/include/asm-x86/pci.h b/include/asm-x86/pci.h
new file mode 100644
index 0000000000000..a8cac8c2cde7d
--- /dev/null
+++ b/include/asm-x86/pci.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "pci_32.h"
+#else
+# include "pci_64.h"
+#endif
diff --git a/include/asm-i386/pci.h b/include/asm-x86/pci_32.h
similarity index 100%
rename from include/asm-i386/pci.h
rename to include/asm-x86/pci_32.h
diff --git a/include/asm-x86_64/pci.h b/include/asm-x86/pci_64.h
similarity index 100%
rename from include/asm-x86_64/pci.h
rename to include/asm-x86/pci_64.h
diff --git a/include/asm-x86_64/pda.h b/include/asm-x86/pda.h
similarity index 100%
rename from include/asm-x86_64/pda.h
rename to include/asm-x86/pda.h
diff --git a/include/asm-x86/percpu.h b/include/asm-x86/percpu.h
new file mode 100644
index 0000000000000..a1aaad274ccae
--- /dev/null
+++ b/include/asm-x86/percpu.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "percpu_32.h"
+#else
+# include "percpu_64.h"
+#endif
diff --git a/include/asm-i386/percpu.h b/include/asm-x86/percpu_32.h
similarity index 100%
rename from include/asm-i386/percpu.h
rename to include/asm-x86/percpu_32.h
diff --git a/include/asm-x86_64/percpu.h b/include/asm-x86/percpu_64.h
similarity index 100%
rename from include/asm-x86_64/percpu.h
rename to include/asm-x86/percpu_64.h
diff --git a/include/asm-x86/pgalloc.h b/include/asm-x86/pgalloc.h
new file mode 100644
index 0000000000000..5886eed05886d
--- /dev/null
+++ b/include/asm-x86/pgalloc.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "pgalloc_32.h"
+#else
+# include "pgalloc_64.h"
+#endif
diff --git a/include/asm-i386/pgalloc.h b/include/asm-x86/pgalloc_32.h
similarity index 100%
rename from include/asm-i386/pgalloc.h
rename to include/asm-x86/pgalloc_32.h
diff --git a/include/asm-x86_64/pgalloc.h b/include/asm-x86/pgalloc_64.h
similarity index 100%
rename from include/asm-x86_64/pgalloc.h
rename to include/asm-x86/pgalloc_64.h
diff --git a/include/asm-i386/pgtable-2level-defs.h b/include/asm-x86/pgtable-2level-defs.h
similarity index 100%
rename from include/asm-i386/pgtable-2level-defs.h
rename to include/asm-x86/pgtable-2level-defs.h
diff --git a/include/asm-i386/pgtable-2level.h b/include/asm-x86/pgtable-2level.h
similarity index 100%
rename from include/asm-i386/pgtable-2level.h
rename to include/asm-x86/pgtable-2level.h
diff --git a/include/asm-i386/pgtable-3level-defs.h b/include/asm-x86/pgtable-3level-defs.h
similarity index 100%
rename from include/asm-i386/pgtable-3level-defs.h
rename to include/asm-x86/pgtable-3level-defs.h
diff --git a/include/asm-i386/pgtable-3level.h b/include/asm-x86/pgtable-3level.h
similarity index 100%
rename from include/asm-i386/pgtable-3level.h
rename to include/asm-x86/pgtable-3level.h
diff --git a/include/asm-x86/pgtable.h b/include/asm-x86/pgtable.h
new file mode 100644
index 0000000000000..1039140652af3
--- /dev/null
+++ b/include/asm-x86/pgtable.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "pgtable_32.h"
+#else
+# include "pgtable_64.h"
+#endif
diff --git a/include/asm-i386/pgtable.h b/include/asm-x86/pgtable_32.h
similarity index 100%
rename from include/asm-i386/pgtable.h
rename to include/asm-x86/pgtable_32.h
diff --git a/include/asm-x86_64/pgtable.h b/include/asm-x86/pgtable_64.h
similarity index 100%
rename from include/asm-x86_64/pgtable.h
rename to include/asm-x86/pgtable_64.h
diff --git a/include/asm-i386/poll.h b/include/asm-x86/poll.h
similarity index 100%
rename from include/asm-i386/poll.h
rename to include/asm-x86/poll.h
diff --git a/include/asm-x86/posix_types.h b/include/asm-x86/posix_types.h
new file mode 100644
index 0000000000000..bb7133dc155d4
--- /dev/null
+++ b/include/asm-x86/posix_types.h
@@ -0,0 +1,13 @@
+#ifdef __KERNEL__
+# ifdef CONFIG_X86_32
+# include "posix_types_32.h"
+# else
+# include "posix_types_64.h"
+# endif
+#else
+# ifdef __i386__
+# include "posix_types_32.h"
+# else
+# include "posix_types_64.h"
+# endif
+#endif
diff --git a/include/asm-i386/posix_types.h b/include/asm-x86/posix_types_32.h
similarity index 100%
rename from include/asm-i386/posix_types.h
rename to include/asm-x86/posix_types_32.h
diff --git a/include/asm-x86_64/posix_types.h b/include/asm-x86/posix_types_64.h
similarity index 100%
rename from include/asm-x86_64/posix_types.h
rename to include/asm-x86/posix_types_64.h
diff --git a/include/asm-x86_64/prctl.h b/include/asm-x86/prctl.h
similarity index 100%
rename from include/asm-x86_64/prctl.h
rename to include/asm-x86/prctl.h
diff --git a/include/asm-i386/processor-cyrix.h b/include/asm-x86/processor-cyrix.h
similarity index 100%
rename from include/asm-i386/processor-cyrix.h
rename to include/asm-x86/processor-cyrix.h
diff --git a/include/asm-i386/processor-flags.h b/include/asm-x86/processor-flags.h
similarity index 100%
rename from include/asm-i386/processor-flags.h
rename to include/asm-x86/processor-flags.h
diff --git a/include/asm-x86/processor.h b/include/asm-x86/processor.h
new file mode 100644
index 0000000000000..46e1c04e309c7
--- /dev/null
+++ b/include/asm-x86/processor.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "processor_32.h"
+#else
+# include "processor_64.h"
+#endif
diff --git a/include/asm-i386/processor.h b/include/asm-x86/processor_32.h
similarity index 100%
rename from include/asm-i386/processor.h
rename to include/asm-x86/processor_32.h
diff --git a/include/asm-x86_64/processor.h b/include/asm-x86/processor_64.h
similarity index 100%
rename from include/asm-x86_64/processor.h
rename to include/asm-x86/processor_64.h
diff --git a/include/asm-x86_64/proto.h b/include/asm-x86/proto.h
similarity index 100%
rename from include/asm-x86_64/proto.h
rename to include/asm-x86/proto.h
diff --git a/include/asm-x86/ptrace-abi.h b/include/asm-x86/ptrace-abi.h
new file mode 100644
index 0000000000000..6824c49def1ca
--- /dev/null
+++ b/include/asm-x86/ptrace-abi.h
@@ -0,0 +1,13 @@
+#ifdef __KERNEL__
+# ifdef CONFIG_X86_32
+# include "ptrace-abi_32.h"
+# else
+# include "ptrace-abi_64.h"
+# endif
+#else
+# ifdef __i386__
+# include "ptrace-abi_32.h"
+# else
+# include "ptrace-abi_64.h"
+# endif
+#endif
diff --git a/include/asm-i386/ptrace-abi.h b/include/asm-x86/ptrace-abi_32.h
similarity index 100%
rename from include/asm-i386/ptrace-abi.h
rename to include/asm-x86/ptrace-abi_32.h
diff --git a/include/asm-x86_64/ptrace-abi.h b/include/asm-x86/ptrace-abi_64.h
similarity index 100%
rename from include/asm-x86_64/ptrace-abi.h
rename to include/asm-x86/ptrace-abi_64.h
diff --git a/include/asm-x86/ptrace.h b/include/asm-x86/ptrace.h
new file mode 100644
index 0000000000000..bc4d64a876895
--- /dev/null
+++ b/include/asm-x86/ptrace.h
@@ -0,0 +1,13 @@
+#ifdef __KERNEL__
+# ifdef CONFIG_X86_32
+# include "ptrace_32.h"
+# else
+# include "ptrace_64.h"
+# endif
+#else
+# ifdef __i386__
+# include "ptrace_32.h"
+# else
+# include "ptrace_64.h"
+# endif
+#endif
diff --git a/include/asm-i386/ptrace.h b/include/asm-x86/ptrace_32.h
similarity index 100%
rename from include/asm-i386/ptrace.h
rename to include/asm-x86/ptrace_32.h
diff --git a/include/asm-x86_64/ptrace.h b/include/asm-x86/ptrace_64.h
similarity index 100%
rename from include/asm-x86_64/ptrace.h
rename to include/asm-x86/ptrace_64.h
diff --git a/include/asm-i386/reboot.h b/include/asm-x86/reboot.h
similarity index 100%
rename from include/asm-i386/reboot.h
rename to include/asm-x86/reboot.h
diff --git a/include/asm-i386/reboot_fixups.h b/include/asm-x86/reboot_fixups.h
similarity index 100%
rename from include/asm-i386/reboot_fixups.h
rename to include/asm-x86/reboot_fixups.h
diff --git a/include/asm-x86/required-features.h b/include/asm-x86/required-features.h
new file mode 100644
index 0000000000000..8b64f3ea2b783
--- /dev/null
+++ b/include/asm-x86/required-features.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "required-features_32.h"
+#else
+# include "required-features_64.h"
+#endif
diff --git a/include/asm-i386/required-features.h b/include/asm-x86/required-features_32.h
similarity index 100%
rename from include/asm-i386/required-features.h
rename to include/asm-x86/required-features_32.h
diff --git a/include/asm-x86_64/required-features.h b/include/asm-x86/required-features_64.h
similarity index 100%
rename from include/asm-x86_64/required-features.h
rename to include/asm-x86/required-features_64.h
diff --git a/include/asm-x86/resource.h b/include/asm-x86/resource.h
new file mode 100644
index 0000000000000..732410a8c02a8
--- /dev/null
+++ b/include/asm-x86/resource.h
@@ -0,0 +1,13 @@
+#ifdef __KERNEL__
+# ifdef CONFIG_X86_32
+# include "resource_32.h"
+# else
+# include "resource_64.h"
+# endif
+#else
+# ifdef __i386__
+# include "resource_32.h"
+# else
+# include "resource_64.h"
+# endif
+#endif
diff --git a/include/asm-i386/resource.h b/include/asm-x86/resource_32.h
similarity index 100%
rename from include/asm-i386/resource.h
rename to include/asm-x86/resource_32.h
diff --git a/include/asm-x86_64/resource.h b/include/asm-x86/resource_64.h
similarity index 100%
rename from include/asm-x86_64/resource.h
rename to include/asm-x86/resource_64.h
diff --git a/include/asm-x86/resume-trace.h b/include/asm-x86/resume-trace.h
new file mode 100644
index 0000000000000..9b6dd093a9f74
--- /dev/null
+++ b/include/asm-x86/resume-trace.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "resume-trace_32.h"
+#else
+# include "resume-trace_64.h"
+#endif
diff --git a/include/asm-i386/resume-trace.h b/include/asm-x86/resume-trace_32.h
similarity index 100%
rename from include/asm-i386/resume-trace.h
rename to include/asm-x86/resume-trace_32.h
diff --git a/include/asm-x86_64/resume-trace.h b/include/asm-x86/resume-trace_64.h
similarity index 100%
rename from include/asm-x86_64/resume-trace.h
rename to include/asm-x86/resume-trace_64.h
diff --git a/include/asm-x86_64/rio.h b/include/asm-x86/rio.h
similarity index 100%
rename from include/asm-x86_64/rio.h
rename to include/asm-x86/rio.h
diff --git a/include/asm-x86/rtc.h b/include/asm-x86/rtc.h
new file mode 100644
index 0000000000000..1f0c98eb2e382
--- /dev/null
+++ b/include/asm-x86/rtc.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "rtc_32.h"
+#else
+# include "rtc_64.h"
+#endif
diff --git a/include/asm-i386/rtc.h b/include/asm-x86/rtc_32.h
similarity index 100%
rename from include/asm-i386/rtc.h
rename to include/asm-x86/rtc_32.h
diff --git a/include/asm-x86_64/rtc.h b/include/asm-x86/rtc_64.h
similarity index 100%
rename from include/asm-x86_64/rtc.h
rename to include/asm-x86/rtc_64.h
diff --git a/include/asm-x86/rwlock.h b/include/asm-x86/rwlock.h
new file mode 100644
index 0000000000000..a3be7d8364afa
--- /dev/null
+++ b/include/asm-x86/rwlock.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "rwlock_32.h"
+#else
+# include "rwlock_64.h"
+#endif
diff --git a/include/asm-i386/rwlock.h b/include/asm-x86/rwlock_32.h
similarity index 100%
rename from include/asm-i386/rwlock.h
rename to include/asm-x86/rwlock_32.h
diff --git a/include/asm-x86_64/rwlock.h b/include/asm-x86/rwlock_64.h
similarity index 100%
rename from include/asm-x86_64/rwlock.h
rename to include/asm-x86/rwlock_64.h
diff --git a/include/asm-i386/rwsem.h b/include/asm-x86/rwsem.h
similarity index 100%
rename from include/asm-i386/rwsem.h
rename to include/asm-x86/rwsem.h
diff --git a/include/asm-x86/scatterlist.h b/include/asm-x86/scatterlist.h
new file mode 100644
index 0000000000000..3a1e76257a276
--- /dev/null
+++ b/include/asm-x86/scatterlist.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "scatterlist_32.h"
+#else
+# include "scatterlist_64.h"
+#endif
diff --git a/include/asm-i386/scatterlist.h b/include/asm-x86/scatterlist_32.h
similarity index 100%
rename from include/asm-i386/scatterlist.h
rename to include/asm-x86/scatterlist_32.h
diff --git a/include/asm-x86_64/scatterlist.h b/include/asm-x86/scatterlist_64.h
similarity index 100%
rename from include/asm-x86_64/scatterlist.h
rename to include/asm-x86/scatterlist_64.h
diff --git a/include/asm-x86/seccomp.h b/include/asm-x86/seccomp.h
new file mode 100644
index 0000000000000..c62e58a5a90de
--- /dev/null
+++ b/include/asm-x86/seccomp.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "seccomp_32.h"
+#else
+# include "seccomp_64.h"
+#endif
diff --git a/include/asm-i386/seccomp.h b/include/asm-x86/seccomp_32.h
similarity index 100%
rename from include/asm-i386/seccomp.h
rename to include/asm-x86/seccomp_32.h
diff --git a/include/asm-x86_64/seccomp.h b/include/asm-x86/seccomp_64.h
similarity index 100%
rename from include/asm-x86_64/seccomp.h
rename to include/asm-x86/seccomp_64.h
diff --git a/include/asm-x86/sections.h b/include/asm-x86/sections.h
new file mode 100644
index 0000000000000..ae6c69d9be3f2
--- /dev/null
+++ b/include/asm-x86/sections.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "sections_32.h"
+#else
+# include "sections_64.h"
+#endif
diff --git a/include/asm-i386/sections.h b/include/asm-x86/sections_32.h
similarity index 100%
rename from include/asm-i386/sections.h
rename to include/asm-x86/sections_32.h
diff --git a/include/asm-x86_64/sections.h b/include/asm-x86/sections_64.h
similarity index 100%
rename from include/asm-x86_64/sections.h
rename to include/asm-x86/sections_64.h
diff --git a/include/asm-x86/segment.h b/include/asm-x86/segment.h
new file mode 100644
index 0000000000000..605068280e285
--- /dev/null
+++ b/include/asm-x86/segment.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "segment_32.h"
+#else
+# include "segment_64.h"
+#endif
diff --git a/include/asm-i386/segment.h b/include/asm-x86/segment_32.h
similarity index 100%
rename from include/asm-i386/segment.h
rename to include/asm-x86/segment_32.h
diff --git a/include/asm-x86_64/segment.h b/include/asm-x86/segment_64.h
similarity index 100%
rename from include/asm-x86_64/segment.h
rename to include/asm-x86/segment_64.h
diff --git a/include/asm-x86/semaphore.h b/include/asm-x86/semaphore.h
new file mode 100644
index 0000000000000..572c0b67a6b09
--- /dev/null
+++ b/include/asm-x86/semaphore.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "semaphore_32.h"
+#else
+# include "semaphore_64.h"
+#endif
diff --git a/include/asm-i386/semaphore.h b/include/asm-x86/semaphore_32.h
similarity index 100%
rename from include/asm-i386/semaphore.h
rename to include/asm-x86/semaphore_32.h
diff --git a/include/asm-x86_64/semaphore.h b/include/asm-x86/semaphore_64.h
similarity index 100%
rename from include/asm-x86_64/semaphore.h
rename to include/asm-x86/semaphore_64.h
diff --git a/include/asm-x86/sembuf.h b/include/asm-x86/sembuf.h
new file mode 100644
index 0000000000000..e42c971e383fd
--- /dev/null
+++ b/include/asm-x86/sembuf.h
@@ -0,0 +1,13 @@
+#ifdef __KERNEL__
+# ifdef CONFIG_X86_32
+# include "sembuf_32.h"
+# else
+# include "sembuf_64.h"
+# endif
+#else
+# ifdef __i386__
+# include "sembuf_32.h"
+# else
+# include "sembuf_64.h"
+# endif
+#endif
diff --git a/include/asm-i386/sembuf.h b/include/asm-x86/sembuf_32.h
similarity index 100%
rename from include/asm-i386/sembuf.h
rename to include/asm-x86/sembuf_32.h
diff --git a/include/asm-x86_64/sembuf.h b/include/asm-x86/sembuf_64.h
similarity index 100%
rename from include/asm-x86_64/sembuf.h
rename to include/asm-x86/sembuf_64.h
diff --git a/include/asm-x86/serial.h b/include/asm-x86/serial.h
new file mode 100644
index 0000000000000..cf1b05227b29e
--- /dev/null
+++ b/include/asm-x86/serial.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "serial_32.h"
+#else
+# include "serial_64.h"
+#endif
diff --git a/include/asm-i386/serial.h b/include/asm-x86/serial_32.h
similarity index 100%
rename from include/asm-i386/serial.h
rename to include/asm-x86/serial_32.h
diff --git a/include/asm-x86_64/serial.h b/include/asm-x86/serial_64.h
similarity index 100%
rename from include/asm-x86_64/serial.h
rename to include/asm-x86/serial_64.h
diff --git a/include/asm-x86/setup.h b/include/asm-x86/setup.h
new file mode 100644
index 0000000000000..81c0d98bb1c82
--- /dev/null
+++ b/include/asm-x86/setup.h
@@ -0,0 +1,13 @@
+#ifdef __KERNEL__
+# ifdef CONFIG_X86_32
+# include "setup_32.h"
+# else
+# include "setup_64.h"
+# endif
+#else
+# ifdef __i386__
+# include "setup_32.h"
+# else
+# include "setup_64.h"
+# endif
+#endif
diff --git a/include/asm-i386/setup.h b/include/asm-x86/setup_32.h
similarity index 100%
rename from include/asm-i386/setup.h
rename to include/asm-x86/setup_32.h
diff --git a/include/asm-x86_64/setup.h b/include/asm-x86/setup_64.h
similarity index 100%
rename from include/asm-x86_64/setup.h
rename to include/asm-x86/setup_64.h
diff --git a/include/asm-x86/shmbuf.h b/include/asm-x86/shmbuf.h
new file mode 100644
index 0000000000000..e85f1cb11217c
--- /dev/null
+++ b/include/asm-x86/shmbuf.h
@@ -0,0 +1,13 @@
+#ifdef __KERNEL__
+# ifdef CONFIG_X86_32
+# include "shmbuf_32.h"
+# else
+# include "shmbuf_64.h"
+# endif
+#else
+# ifdef __i386__
+# include "shmbuf_32.h"
+# else
+# include "shmbuf_64.h"
+# endif
+#endif
diff --git a/include/asm-i386/shmbuf.h b/include/asm-x86/shmbuf_32.h
similarity index 100%
rename from include/asm-i386/shmbuf.h
rename to include/asm-x86/shmbuf_32.h
diff --git a/include/asm-x86_64/shmbuf.h b/include/asm-x86/shmbuf_64.h
similarity index 100%
rename from include/asm-x86_64/shmbuf.h
rename to include/asm-x86/shmbuf_64.h
diff --git a/include/asm-x86/shmparam.h b/include/asm-x86/shmparam.h
new file mode 100644
index 0000000000000..165627cc5345f
--- /dev/null
+++ b/include/asm-x86/shmparam.h
@@ -0,0 +1,13 @@
+#ifdef __KERNEL__
+# ifdef CONFIG_X86_32
+# include "shmparam_32.h"
+# else
+# include "shmparam_64.h"
+# endif
+#else
+# ifdef __i386__
+# include "shmparam_32.h"
+# else
+# include "shmparam_64.h"
+# endif
+#endif
diff --git a/include/asm-i386/shmparam.h b/include/asm-x86/shmparam_32.h
similarity index 100%
rename from include/asm-i386/shmparam.h
rename to include/asm-x86/shmparam_32.h
diff --git a/include/asm-x86_64/shmparam.h b/include/asm-x86/shmparam_64.h
similarity index 100%
rename from include/asm-x86_64/shmparam.h
rename to include/asm-x86/shmparam_64.h
diff --git a/include/asm-x86/sigcontext.h b/include/asm-x86/sigcontext.h
new file mode 100644
index 0000000000000..0d16ceff15993
--- /dev/null
+++ b/include/asm-x86/sigcontext.h
@@ -0,0 +1,13 @@
+#ifdef __KERNEL__
+# ifdef CONFIG_X86_32
+# include "sigcontext_32.h"
+# else
+# include "sigcontext_64.h"
+# endif
+#else
+# ifdef __i386__
+# include "sigcontext_32.h"
+# else
+# include "sigcontext_64.h"
+# endif
+#endif
diff --git a/include/asm-x86_64/sigcontext32.h b/include/asm-x86/sigcontext32.h
similarity index 100%
rename from include/asm-x86_64/sigcontext32.h
rename to include/asm-x86/sigcontext32.h
diff --git a/include/asm-i386/sigcontext.h b/include/asm-x86/sigcontext_32.h
similarity index 100%
rename from include/asm-i386/sigcontext.h
rename to include/asm-x86/sigcontext_32.h
diff --git a/include/asm-x86_64/sigcontext.h b/include/asm-x86/sigcontext_64.h
similarity index 100%
rename from include/asm-x86_64/sigcontext.h
rename to include/asm-x86/sigcontext_64.h
diff --git a/include/asm-x86/siginfo.h b/include/asm-x86/siginfo.h
new file mode 100644
index 0000000000000..0b8e4bb47d25b
--- /dev/null
+++ b/include/asm-x86/siginfo.h
@@ -0,0 +1,13 @@
+#ifdef __KERNEL__
+# ifdef CONFIG_X86_32
+# include "siginfo_32.h"
+# else
+# include "siginfo_64.h"
+# endif
+#else
+# ifdef __i386__
+# include "siginfo_32.h"
+# else
+# include "siginfo_64.h"
+# endif
+#endif
diff --git a/include/asm-i386/siginfo.h b/include/asm-x86/siginfo_32.h
similarity index 100%
rename from include/asm-i386/siginfo.h
rename to include/asm-x86/siginfo_32.h
diff --git a/include/asm-x86_64/siginfo.h b/include/asm-x86/siginfo_64.h
similarity index 100%
rename from include/asm-x86_64/siginfo.h
rename to include/asm-x86/siginfo_64.h
diff --git a/include/asm-x86/signal.h b/include/asm-x86/signal.h
new file mode 100644
index 0000000000000..bf5a63f457dac
--- /dev/null
+++ b/include/asm-x86/signal.h
@@ -0,0 +1,13 @@
+#ifdef __KERNEL__
+# ifdef CONFIG_X86_32
+# include "signal_32.h"
+# else
+# include "signal_64.h"
+# endif
+#else
+# ifdef __i386__
+# include "signal_32.h"
+# else
+# include "signal_64.h"
+# endif
+#endif
diff --git a/include/asm-i386/signal.h b/include/asm-x86/signal_32.h
similarity index 100%
rename from include/asm-i386/signal.h
rename to include/asm-x86/signal_32.h
diff --git a/include/asm-x86_64/signal.h b/include/asm-x86/signal_64.h
similarity index 100%
rename from include/asm-x86_64/signal.h
rename to include/asm-x86/signal_64.h
diff --git a/include/asm-x86/smp.h b/include/asm-x86/smp.h
new file mode 100644
index 0000000000000..f2e8319a6b0bf
--- /dev/null
+++ b/include/asm-x86/smp.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "smp_32.h"
+#else
+# include "smp_64.h"
+#endif
diff --git a/include/asm-i386/smp.h b/include/asm-x86/smp_32.h
similarity index 100%
rename from include/asm-i386/smp.h
rename to include/asm-x86/smp_32.h
diff --git a/include/asm-x86_64/smp.h b/include/asm-x86/smp_64.h
similarity index 100%
rename from include/asm-x86_64/smp.h
rename to include/asm-x86/smp_64.h
diff --git a/include/asm-i386/socket.h b/include/asm-x86/socket.h
similarity index 100%
rename from include/asm-i386/socket.h
rename to include/asm-x86/socket.h
diff --git a/include/asm-x86/sockios.h b/include/asm-x86/sockios.h
new file mode 100644
index 0000000000000..5a134fc70b9c4
--- /dev/null
+++ b/include/asm-x86/sockios.h
@@ -0,0 +1,13 @@
+#ifdef __KERNEL__
+# ifdef CONFIG_X86_32
+# include "sockios_32.h"
+# else
+# include "sockios_64.h"
+# endif
+#else
+# ifdef __i386__
+# include "sockios_32.h"
+# else
+# include "sockios_64.h"
+# endif
+#endif
diff --git a/include/asm-i386/sockios.h b/include/asm-x86/sockios_32.h
similarity index 100%
rename from include/asm-i386/sockios.h
rename to include/asm-x86/sockios_32.h
diff --git a/include/asm-x86_64/sockios.h b/include/asm-x86/sockios_64.h
similarity index 100%
rename from include/asm-x86_64/sockios.h
rename to include/asm-x86/sockios_64.h
diff --git a/include/asm-x86/sparsemem.h b/include/asm-x86/sparsemem.h
new file mode 100644
index 0000000000000..3f203b1d9ee8d
--- /dev/null
+++ b/include/asm-x86/sparsemem.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "sparsemem_32.h"
+#else
+# include "sparsemem_64.h"
+#endif
diff --git a/include/asm-i386/sparsemem.h b/include/asm-x86/sparsemem_32.h
similarity index 100%
rename from include/asm-i386/sparsemem.h
rename to include/asm-x86/sparsemem_32.h
diff --git a/include/asm-x86_64/sparsemem.h b/include/asm-x86/sparsemem_64.h
similarity index 100%
rename from include/asm-x86_64/sparsemem.h
rename to include/asm-x86/sparsemem_64.h
diff --git a/include/asm-x86/spinlock.h b/include/asm-x86/spinlock.h
new file mode 100644
index 0000000000000..d74d85e71dcb0
--- /dev/null
+++ b/include/asm-x86/spinlock.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "spinlock_32.h"
+#else
+# include "spinlock_64.h"
+#endif
diff --git a/include/asm-i386/spinlock.h b/include/asm-x86/spinlock_32.h
similarity index 100%
rename from include/asm-i386/spinlock.h
rename to include/asm-x86/spinlock_32.h
diff --git a/include/asm-x86_64/spinlock.h b/include/asm-x86/spinlock_64.h
similarity index 100%
rename from include/asm-x86_64/spinlock.h
rename to include/asm-x86/spinlock_64.h
diff --git a/include/asm-i386/spinlock_types.h b/include/asm-x86/spinlock_types.h
similarity index 100%
rename from include/asm-i386/spinlock_types.h
rename to include/asm-x86/spinlock_types.h
diff --git a/include/asm-i386/srat.h b/include/asm-x86/srat.h
similarity index 100%
rename from include/asm-i386/srat.h
rename to include/asm-x86/srat.h
diff --git a/include/asm-x86_64/stacktrace.h b/include/asm-x86/stacktrace.h
similarity index 100%
rename from include/asm-x86_64/stacktrace.h
rename to include/asm-x86/stacktrace.h
diff --git a/include/asm-x86/stat.h b/include/asm-x86/stat.h
new file mode 100644
index 0000000000000..3ff6b50ef8335
--- /dev/null
+++ b/include/asm-x86/stat.h
@@ -0,0 +1,13 @@
+#ifdef __KERNEL__
+# ifdef CONFIG_X86_32
+# include "stat_32.h"
+# else
+# include "stat_64.h"
+# endif
+#else
+# ifdef __i386__
+# include "stat_32.h"
+# else
+# include "stat_64.h"
+# endif
+#endif
diff --git a/include/asm-i386/stat.h b/include/asm-x86/stat_32.h
similarity index 100%
rename from include/asm-i386/stat.h
rename to include/asm-x86/stat_32.h
diff --git a/include/asm-x86_64/stat.h b/include/asm-x86/stat_64.h
similarity index 100%
rename from include/asm-x86_64/stat.h
rename to include/asm-x86/stat_64.h
diff --git a/include/asm-x86/statfs.h b/include/asm-x86/statfs.h
new file mode 100644
index 0000000000000..327fb5d7a148d
--- /dev/null
+++ b/include/asm-x86/statfs.h
@@ -0,0 +1,13 @@
+#ifdef __KERNEL__
+# ifdef CONFIG_X86_32
+# include "statfs_32.h"
+# else
+# include "statfs_64.h"
+# endif
+#else
+# ifdef __i386__
+# include "statfs_32.h"
+# else
+# include "statfs_64.h"
+# endif
+#endif
diff --git a/include/asm-i386/statfs.h b/include/asm-x86/statfs_32.h
similarity index 100%
rename from include/asm-i386/statfs.h
rename to include/asm-x86/statfs_32.h
diff --git a/include/asm-x86_64/statfs.h b/include/asm-x86/statfs_64.h
similarity index 100%
rename from include/asm-x86_64/statfs.h
rename to include/asm-x86/statfs_64.h
diff --git a/include/asm-x86/string.h b/include/asm-x86/string.h
new file mode 100644
index 0000000000000..6dfd6d9373a04
--- /dev/null
+++ b/include/asm-x86/string.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "string_32.h"
+#else
+# include "string_64.h"
+#endif
diff --git a/include/asm-i386/string.h b/include/asm-x86/string_32.h
similarity index 100%
rename from include/asm-i386/string.h
rename to include/asm-x86/string_32.h
diff --git a/include/asm-x86_64/string.h b/include/asm-x86/string_64.h
similarity index 100%
rename from include/asm-x86_64/string.h
rename to include/asm-x86/string_64.h
diff --git a/include/asm-x86/suspend.h b/include/asm-x86/suspend.h
new file mode 100644
index 0000000000000..9bd521fe4570e
--- /dev/null
+++ b/include/asm-x86/suspend.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "suspend_32.h"
+#else
+# include "suspend_64.h"
+#endif
diff --git a/include/asm-i386/suspend.h b/include/asm-x86/suspend_32.h
similarity index 100%
rename from include/asm-i386/suspend.h
rename to include/asm-x86/suspend_32.h
diff --git a/include/asm-x86_64/suspend.h b/include/asm-x86/suspend_64.h
similarity index 100%
rename from include/asm-x86_64/suspend.h
rename to include/asm-x86/suspend_64.h
diff --git a/include/asm-x86_64/swiotlb.h b/include/asm-x86/swiotlb.h
similarity index 100%
rename from include/asm-x86_64/swiotlb.h
rename to include/asm-x86/swiotlb.h
diff --git a/include/asm-i386/sync_bitops.h b/include/asm-x86/sync_bitops.h
similarity index 100%
rename from include/asm-i386/sync_bitops.h
rename to include/asm-x86/sync_bitops.h
diff --git a/include/asm-x86/system.h b/include/asm-x86/system.h
new file mode 100644
index 0000000000000..692562b48f2a6
--- /dev/null
+++ b/include/asm-x86/system.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "system_32.h"
+#else
+# include "system_64.h"
+#endif
diff --git a/include/asm-i386/system.h b/include/asm-x86/system_32.h
similarity index 100%
rename from include/asm-i386/system.h
rename to include/asm-x86/system_32.h
diff --git a/include/asm-x86_64/system.h b/include/asm-x86/system_64.h
similarity index 100%
rename from include/asm-x86_64/system.h
rename to include/asm-x86/system_64.h
diff --git a/include/asm-x86_64/tce.h b/include/asm-x86/tce.h
similarity index 100%
rename from include/asm-x86_64/tce.h
rename to include/asm-x86/tce.h
diff --git a/include/asm-x86/termbits.h b/include/asm-x86/termbits.h
new file mode 100644
index 0000000000000..69f3080e2a1db
--- /dev/null
+++ b/include/asm-x86/termbits.h
@@ -0,0 +1,13 @@
+#ifdef __KERNEL__
+# ifdef CONFIG_X86_32
+# include "termbits_32.h"
+# else
+# include "termbits_64.h"
+# endif
+#else
+# ifdef __i386__
+# include "termbits_32.h"
+# else
+# include "termbits_64.h"
+# endif
+#endif
diff --git a/include/asm-i386/termbits.h b/include/asm-x86/termbits_32.h
similarity index 100%
rename from include/asm-i386/termbits.h
rename to include/asm-x86/termbits_32.h
diff --git a/include/asm-x86_64/termbits.h b/include/asm-x86/termbits_64.h
similarity index 100%
rename from include/asm-x86_64/termbits.h
rename to include/asm-x86/termbits_64.h
diff --git a/include/asm-x86/termios.h b/include/asm-x86/termios.h
new file mode 100644
index 0000000000000..a4f4ae20a5910
--- /dev/null
+++ b/include/asm-x86/termios.h
@@ -0,0 +1,13 @@
+#ifdef __KERNEL__
+# ifdef CONFIG_X86_32
+# include "termios_32.h"
+# else
+# include "termios_64.h"
+# endif
+#else
+# ifdef __i386__
+# include "termios_32.h"
+# else
+# include "termios_64.h"
+# endif
+#endif
diff --git a/include/asm-i386/termios.h b/include/asm-x86/termios_32.h
similarity index 100%
rename from include/asm-i386/termios.h
rename to include/asm-x86/termios_32.h
diff --git a/include/asm-x86_64/termios.h b/include/asm-x86/termios_64.h
similarity index 100%
rename from include/asm-x86_64/termios.h
rename to include/asm-x86/termios_64.h
diff --git a/include/asm-i386/therm_throt.h b/include/asm-x86/therm_throt.h
similarity index 100%
rename from include/asm-i386/therm_throt.h
rename to include/asm-x86/therm_throt.h
diff --git a/include/asm-x86/thread_info.h b/include/asm-x86/thread_info.h
new file mode 100644
index 0000000000000..d5fd12f2abdbb
--- /dev/null
+++ b/include/asm-x86/thread_info.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "thread_info_32.h"
+#else
+# include "thread_info_64.h"
+#endif
diff --git a/include/asm-i386/thread_info.h b/include/asm-x86/thread_info_32.h
similarity index 100%
rename from include/asm-i386/thread_info.h
rename to include/asm-x86/thread_info_32.h
diff --git a/include/asm-x86_64/thread_info.h b/include/asm-x86/thread_info_64.h
similarity index 100%
rename from include/asm-x86_64/thread_info.h
rename to include/asm-x86/thread_info_64.h
diff --git a/include/asm-i386/time.h b/include/asm-x86/time.h
similarity index 100%
rename from include/asm-i386/time.h
rename to include/asm-x86/time.h
diff --git a/include/asm-i386/timer.h b/include/asm-x86/timer.h
similarity index 100%
rename from include/asm-i386/timer.h
rename to include/asm-x86/timer.h
diff --git a/include/asm-x86/timex.h b/include/asm-x86/timex.h
new file mode 100644
index 0000000000000..d01c18cfccef9
--- /dev/null
+++ b/include/asm-x86/timex.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "timex_32.h"
+#else
+# include "timex_64.h"
+#endif
diff --git a/include/asm-i386/timex.h b/include/asm-x86/timex_32.h
similarity index 100%
rename from include/asm-i386/timex.h
rename to include/asm-x86/timex_32.h
diff --git a/include/asm-x86_64/timex.h b/include/asm-x86/timex_64.h
similarity index 100%
rename from include/asm-x86_64/timex.h
rename to include/asm-x86/timex_64.h
diff --git a/include/asm-x86/tlb.h b/include/asm-x86/tlb.h
new file mode 100644
index 0000000000000..7d55c3762b431
--- /dev/null
+++ b/include/asm-x86/tlb.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "tlb_32.h"
+#else
+# include "tlb_64.h"
+#endif
diff --git a/include/asm-i386/tlb.h b/include/asm-x86/tlb_32.h
similarity index 100%
rename from include/asm-i386/tlb.h
rename to include/asm-x86/tlb_32.h
diff --git a/include/asm-x86_64/tlb.h b/include/asm-x86/tlb_64.h
similarity index 100%
rename from include/asm-x86_64/tlb.h
rename to include/asm-x86/tlb_64.h
diff --git a/include/asm-x86/tlbflush.h b/include/asm-x86/tlbflush.h
new file mode 100644
index 0000000000000..9af4cc83a1afc
--- /dev/null
+++ b/include/asm-x86/tlbflush.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "tlbflush_32.h"
+#else
+# include "tlbflush_64.h"
+#endif
diff --git a/include/asm-i386/tlbflush.h b/include/asm-x86/tlbflush_32.h
similarity index 100%
rename from include/asm-i386/tlbflush.h
rename to include/asm-x86/tlbflush_32.h
diff --git a/include/asm-x86_64/tlbflush.h b/include/asm-x86/tlbflush_64.h
similarity index 100%
rename from include/asm-x86_64/tlbflush.h
rename to include/asm-x86/tlbflush_64.h
diff --git a/include/asm-x86/topology.h b/include/asm-x86/topology.h
new file mode 100644
index 0000000000000..b10fde9798ea5
--- /dev/null
+++ b/include/asm-x86/topology.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "topology_32.h"
+#else
+# include "topology_64.h"
+#endif
diff --git a/include/asm-i386/topology.h b/include/asm-x86/topology_32.h
similarity index 100%
rename from include/asm-i386/topology.h
rename to include/asm-x86/topology_32.h
diff --git a/include/asm-x86_64/topology.h b/include/asm-x86/topology_64.h
similarity index 100%
rename from include/asm-x86_64/topology.h
rename to include/asm-x86/topology_64.h
diff --git a/include/asm-i386/tsc.h b/include/asm-x86/tsc.h
similarity index 100%
rename from include/asm-i386/tsc.h
rename to include/asm-x86/tsc.h
diff --git a/include/asm-x86/types.h b/include/asm-x86/types.h
new file mode 100644
index 0000000000000..a777a9b839742
--- /dev/null
+++ b/include/asm-x86/types.h
@@ -0,0 +1,13 @@
+#ifdef __KERNEL__
+# ifdef CONFIG_X86_32
+# include "types_32.h"
+# else
+# include "types_64.h"
+# endif
+#else
+# ifdef __i386__
+# include "types_32.h"
+# else
+# include "types_64.h"
+# endif
+#endif
diff --git a/include/asm-i386/types.h b/include/asm-x86/types_32.h
similarity index 100%
rename from include/asm-i386/types.h
rename to include/asm-x86/types_32.h
diff --git a/include/asm-x86_64/types.h b/include/asm-x86/types_64.h
similarity index 100%
rename from include/asm-x86_64/types.h
rename to include/asm-x86/types_64.h
diff --git a/include/asm-x86/uaccess.h b/include/asm-x86/uaccess.h
new file mode 100644
index 0000000000000..9fefd2947e785
--- /dev/null
+++ b/include/asm-x86/uaccess.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "uaccess_32.h"
+#else
+# include "uaccess_64.h"
+#endif
diff --git a/include/asm-i386/uaccess.h b/include/asm-x86/uaccess_32.h
similarity index 100%
rename from include/asm-i386/uaccess.h
rename to include/asm-x86/uaccess_32.h
diff --git a/include/asm-x86_64/uaccess.h b/include/asm-x86/uaccess_64.h
similarity index 100%
rename from include/asm-x86_64/uaccess.h
rename to include/asm-x86/uaccess_64.h
diff --git a/include/asm-x86/ucontext.h b/include/asm-x86/ucontext.h
new file mode 100644
index 0000000000000..175c8cb597317
--- /dev/null
+++ b/include/asm-x86/ucontext.h
@@ -0,0 +1,13 @@
+#ifdef __KERNEL__
+# ifdef CONFIG_X86_32
+# include "ucontext_32.h"
+# else
+# include "ucontext_64.h"
+# endif
+#else
+# ifdef __i386__
+# include "ucontext_32.h"
+# else
+# include "ucontext_64.h"
+# endif
+#endif
diff --git a/include/asm-i386/ucontext.h b/include/asm-x86/ucontext_32.h
similarity index 100%
rename from include/asm-i386/ucontext.h
rename to include/asm-x86/ucontext_32.h
diff --git a/include/asm-x86_64/ucontext.h b/include/asm-x86/ucontext_64.h
similarity index 100%
rename from include/asm-x86_64/ucontext.h
rename to include/asm-x86/ucontext_64.h
diff --git a/include/asm-x86/unaligned.h b/include/asm-x86/unaligned.h
new file mode 100644
index 0000000000000..68067150fbcbd
--- /dev/null
+++ b/include/asm-x86/unaligned.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "unaligned_32.h"
+#else
+# include "unaligned_64.h"
+#endif
diff --git a/include/asm-i386/unaligned.h b/include/asm-x86/unaligned_32.h
similarity index 100%
rename from include/asm-i386/unaligned.h
rename to include/asm-x86/unaligned_32.h
diff --git a/include/asm-x86_64/unaligned.h b/include/asm-x86/unaligned_64.h
similarity index 100%
rename from include/asm-x86_64/unaligned.h
rename to include/asm-x86/unaligned_64.h
diff --git a/include/asm-x86/unistd.h b/include/asm-x86/unistd.h
new file mode 100644
index 0000000000000..2a58ed3e51d82
--- /dev/null
+++ b/include/asm-x86/unistd.h
@@ -0,0 +1,13 @@
+#ifdef __KERNEL__
+# ifdef CONFIG_X86_32
+# include "unistd_32.h"
+# else
+# include "unistd_64.h"
+# endif
+#else
+# ifdef __i386__
+# include "unistd_32.h"
+# else
+# include "unistd_64.h"
+# endif
+#endif
diff --git a/include/asm-i386/unistd.h b/include/asm-x86/unistd_32.h
similarity index 100%
rename from include/asm-i386/unistd.h
rename to include/asm-x86/unistd_32.h
diff --git a/include/asm-x86_64/unistd.h b/include/asm-x86/unistd_64.h
similarity index 100%
rename from include/asm-x86_64/unistd.h
rename to include/asm-x86/unistd_64.h
diff --git a/include/asm-x86/unwind.h b/include/asm-x86/unwind.h
new file mode 100644
index 0000000000000..7e4d7ad552080
--- /dev/null
+++ b/include/asm-x86/unwind.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "unwind_32.h"
+#else
+# include "unwind_64.h"
+#endif
diff --git a/include/asm-i386/unwind.h b/include/asm-x86/unwind_32.h
similarity index 100%
rename from include/asm-i386/unwind.h
rename to include/asm-x86/unwind_32.h
diff --git a/include/asm-x86_64/unwind.h b/include/asm-x86/unwind_64.h
similarity index 100%
rename from include/asm-x86_64/unwind.h
rename to include/asm-x86/unwind_64.h
diff --git a/include/asm-x86/user.h b/include/asm-x86/user.h
new file mode 100644
index 0000000000000..484715abe74a6
--- /dev/null
+++ b/include/asm-x86/user.h
@@ -0,0 +1,13 @@
+#ifdef __KERNEL__
+# ifdef CONFIG_X86_32
+# include "user_32.h"
+# else
+# include "user_64.h"
+# endif
+#else
+# ifdef __i386__
+# include "user_32.h"
+# else
+# include "user_64.h"
+# endif
+#endif
diff --git a/include/asm-x86_64/user32.h b/include/asm-x86/user32.h
similarity index 100%
rename from include/asm-x86_64/user32.h
rename to include/asm-x86/user32.h
diff --git a/include/asm-i386/user.h b/include/asm-x86/user_32.h
similarity index 100%
rename from include/asm-i386/user.h
rename to include/asm-x86/user_32.h
diff --git a/include/asm-x86_64/user.h b/include/asm-x86/user_64.h
similarity index 100%
rename from include/asm-x86_64/user.h
rename to include/asm-x86/user_64.h
diff --git a/include/asm-i386/vga.h b/include/asm-x86/vga.h
similarity index 100%
rename from include/asm-i386/vga.h
rename to include/asm-x86/vga.h
diff --git a/include/asm-x86_64/vgtod.h b/include/asm-x86/vgtod.h
similarity index 100%
rename from include/asm-x86_64/vgtod.h
rename to include/asm-x86/vgtod.h
diff --git a/include/asm-i386/vic.h b/include/asm-x86/vic.h
similarity index 100%
rename from include/asm-i386/vic.h
rename to include/asm-x86/vic.h
diff --git a/include/asm-i386/vm86.h b/include/asm-x86/vm86.h
similarity index 100%
rename from include/asm-i386/vm86.h
rename to include/asm-x86/vm86.h
diff --git a/include/asm-i386/vmi.h b/include/asm-x86/vmi.h
similarity index 100%
rename from include/asm-i386/vmi.h
rename to include/asm-x86/vmi.h
diff --git a/include/asm-i386/vmi_time.h b/include/asm-x86/vmi_time.h
similarity index 100%
rename from include/asm-i386/vmi_time.h
rename to include/asm-x86/vmi_time.h
diff --git a/include/asm-i386/voyager.h b/include/asm-x86/voyager.h
similarity index 100%
rename from include/asm-i386/voyager.h
rename to include/asm-x86/voyager.h
diff --git a/include/asm-x86_64/vsyscall.h b/include/asm-x86/vsyscall.h
similarity index 100%
rename from include/asm-x86_64/vsyscall.h
rename to include/asm-x86/vsyscall.h
diff --git a/include/asm-x86_64/vsyscall32.h b/include/asm-x86/vsyscall32.h
similarity index 100%
rename from include/asm-x86_64/vsyscall32.h
rename to include/asm-x86/vsyscall32.h
diff --git a/include/asm-i386/xen/hypercall.h b/include/asm-x86/xen/hypercall.h
similarity index 100%
rename from include/asm-i386/xen/hypercall.h
rename to include/asm-x86/xen/hypercall.h
diff --git a/include/asm-i386/xen/hypervisor.h b/include/asm-x86/xen/hypervisor.h
similarity index 100%
rename from include/asm-i386/xen/hypervisor.h
rename to include/asm-x86/xen/hypervisor.h
diff --git a/include/asm-i386/xen/interface.h b/include/asm-x86/xen/interface.h
similarity index 100%
rename from include/asm-i386/xen/interface.h
rename to include/asm-x86/xen/interface.h
diff --git a/include/asm-x86/xor.h b/include/asm-x86/xor.h
new file mode 100644
index 0000000000000..11b3bb86e17bc
--- /dev/null
+++ b/include/asm-x86/xor.h
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "xor_32.h"
+#else
+# include "xor_64.h"
+#endif
diff --git a/include/asm-i386/xor.h b/include/asm-x86/xor_32.h
similarity index 100%
rename from include/asm-i386/xor.h
rename to include/asm-x86/xor_32.h
diff --git a/include/asm-x86_64/xor.h b/include/asm-x86/xor_64.h
similarity index 100%
rename from include/asm-x86_64/xor.h
rename to include/asm-x86/xor_64.h
diff --git a/include/asm-x86_64/Kbuild b/include/asm-x86_64/Kbuild
deleted file mode 100644
index 75a2deffca680..0000000000000
--- a/include/asm-x86_64/Kbuild
+++ /dev/null
@@ -1,21 +0,0 @@
-include include/asm-generic/Kbuild.asm
-
-ALTARCH := i386
-ARCHDEF := defined __x86_64__
-ALTARCHDEF := defined __i386__
-
-header-y += boot.h
-header-y += bootsetup.h
-header-y += debugreg.h
-header-y += ldt.h
-header-y += msr-index.h
-header-y += prctl.h
-header-y += ptrace-abi.h
-header-y += sigcontext32.h
-header-y += ucontext.h
-header-y += vsyscall32.h
-
-unifdef-y += mce.h
-unifdef-y += msr.h
-unifdef-y += mtrr.h
-unifdef-y += vsyscall.h
diff --git a/include/asm-x86_64/boot.h b/include/asm-x86_64/boot.h
deleted file mode 100644
index 3c46cea8db7fa..0000000000000
--- a/include/asm-x86_64/boot.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-i386/boot.h>
diff --git a/include/asm-x86_64/bootparam.h b/include/asm-x86_64/bootparam.h
deleted file mode 100644
index aa82e5238d827..0000000000000
--- a/include/asm-x86_64/bootparam.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-i386/bootparam.h>
diff --git a/include/asm-x86_64/cpu.h b/include/asm-x86_64/cpu.h
deleted file mode 100644
index 8eea076525a4e..0000000000000
--- a/include/asm-x86_64/cpu.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-i386/cpu.h>
diff --git a/include/asm-x86_64/emergency-restart.h b/include/asm-x86_64/emergency-restart.h
deleted file mode 100644
index 680c395633454..0000000000000
--- a/include/asm-x86_64/emergency-restart.h
+++ /dev/null
@@ -1,6 +0,0 @@
-#ifndef _ASM_EMERGENCY_RESTART_H
-#define _ASM_EMERGENCY_RESTART_H
-
-extern void machine_emergency_restart(void);
-
-#endif /* _ASM_EMERGENCY_RESTART_H */
diff --git a/include/asm-x86_64/fcntl.h b/include/asm-x86_64/fcntl.h
deleted file mode 100644
index 46ab12db57397..0000000000000
--- a/include/asm-x86_64/fcntl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/fcntl.h>
diff --git a/include/asm-x86_64/hypertransport.h b/include/asm-x86_64/hypertransport.h
deleted file mode 100644
index 5cbf9fa5e0b5e..0000000000000
--- a/include/asm-x86_64/hypertransport.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-i386/hypertransport.h>
diff --git a/include/asm-x86_64/ide.h b/include/asm-x86_64/ide.h
deleted file mode 100644
index 4cef0ef618786..0000000000000
--- a/include/asm-x86_64/ide.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-i386/ide.h>
diff --git a/include/asm-x86_64/ioctl.h b/include/asm-x86_64/ioctl.h
deleted file mode 100644
index b279fe06dfe5b..0000000000000
--- a/include/asm-x86_64/ioctl.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/ioctl.h>
diff --git a/include/asm-x86_64/ist.h b/include/asm-x86_64/ist.h
deleted file mode 100644
index 338857ecbc68f..0000000000000
--- a/include/asm-x86_64/ist.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-i386/ist.h>
diff --git a/include/asm-x86_64/msidef.h b/include/asm-x86_64/msidef.h
deleted file mode 100644
index 083ad5827e482..0000000000000
--- a/include/asm-x86_64/msidef.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-i386/msidef.h>
diff --git a/include/asm-x86_64/msr-index.h b/include/asm-x86_64/msr-index.h
deleted file mode 100644
index d77a63f1ddf28..0000000000000
--- a/include/asm-x86_64/msr-index.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-i386/msr-index.h>
diff --git a/include/asm-x86_64/poll.h b/include/asm-x86_64/poll.h
deleted file mode 100644
index c98509d3149e6..0000000000000
--- a/include/asm-x86_64/poll.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/poll.h>
diff --git a/include/asm-x86_64/processor-flags.h b/include/asm-x86_64/processor-flags.h
deleted file mode 100644
index ec99a57b2c6ab..0000000000000
--- a/include/asm-x86_64/processor-flags.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-i386/processor-flags.h>
diff --git a/include/asm-x86_64/socket.h b/include/asm-x86_64/socket.h
deleted file mode 100644
index 90af60cf3c0e8..0000000000000
--- a/include/asm-x86_64/socket.h
+++ /dev/null
@@ -1,55 +0,0 @@
-#ifndef _ASM_SOCKET_H
-#define _ASM_SOCKET_H
-
-#include <asm/sockios.h>
-
-/* For setsockopt(2) */
-#define SOL_SOCKET 1
-
-#define SO_DEBUG 1
-#define SO_REUSEADDR 2
-#define SO_TYPE 3
-#define SO_ERROR 4
-#define SO_DONTROUTE 5
-#define SO_BROADCAST 6
-#define SO_SNDBUF 7
-#define SO_RCVBUF 8
-#define SO_SNDBUFFORCE 32
-#define SO_RCVBUFFORCE 33
-#define SO_KEEPALIVE 9
-#define SO_OOBINLINE 10
-#define SO_NO_CHECK 11
-#define SO_PRIORITY 12
-#define SO_LINGER 13
-#define SO_BSDCOMPAT 14
-/* To add :#define SO_REUSEPORT 15 */
-#define SO_PASSCRED 16
-#define SO_PEERCRED 17
-#define SO_RCVLOWAT 18
-#define SO_SNDLOWAT 19
-#define SO_RCVTIMEO 20
-#define SO_SNDTIMEO 21
-
-/* Security levels - as per NRL IPv6 - don't actually do anything */
-#define SO_SECURITY_AUTHENTICATION 22
-#define SO_SECURITY_ENCRYPTION_TRANSPORT 23
-#define SO_SECURITY_ENCRYPTION_NETWORK 24
-
-#define SO_BINDTODEVICE 25
-
-/* Socket filtering */
-#define SO_ATTACH_FILTER 26
-#define SO_DETACH_FILTER 27
-
-#define SO_PEERNAME 28
-#define SO_TIMESTAMP 29
-#define SCM_TIMESTAMP SO_TIMESTAMP
-
-#define SO_ACCEPTCONN 30
-
-#define SO_PEERSEC 31
-#define SO_PASSSEC 34
-#define SO_TIMESTAMPNS 35
-#define SCM_TIMESTAMPNS SO_TIMESTAMPNS
-
-#endif /* _ASM_SOCKET_H */
diff --git a/include/asm-x86_64/spinlock_types.h b/include/asm-x86_64/spinlock_types.h
deleted file mode 100644
index 4da9345c15001..0000000000000
--- a/include/asm-x86_64/spinlock_types.h
+++ /dev/null
@@ -1,20 +0,0 @@
-#ifndef __ASM_SPINLOCK_TYPES_H
-#define __ASM_SPINLOCK_TYPES_H
-
-#ifndef __LINUX_SPINLOCK_TYPES_H
-# error "please don't include this file directly"
-#endif
-
-typedef struct {
- unsigned int slock;
-} raw_spinlock_t;
-
-#define __RAW_SPIN_LOCK_UNLOCKED { 1 }
-
-typedef struct {
- unsigned int lock;
-} raw_rwlock_t;
-
-#define __RAW_RW_LOCK_UNLOCKED { RW_LOCK_BIAS }
-
-#endif
diff --git a/include/asm-x86_64/therm_throt.h b/include/asm-x86_64/therm_throt.h
deleted file mode 100644
index 5aac059007bab..0000000000000
--- a/include/asm-x86_64/therm_throt.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-i386/therm_throt.h>
diff --git a/include/asm-x86_64/tsc.h b/include/asm-x86_64/tsc.h
deleted file mode 100644
index d66ba6ef25f68..0000000000000
--- a/include/asm-x86_64/tsc.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-i386/tsc.h>
diff --git a/include/asm-x86_64/vga.h b/include/asm-x86_64/vga.h
deleted file mode 100644
index 0ecf68ac03aa9..0000000000000
--- a/include/asm-x86_64/vga.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * Access to VGA videoram
- *
- * (c) 1998 Martin Mares <mj@ucw.cz>
- */
-
-#ifndef _LINUX_ASM_VGA_H_
-#define _LINUX_ASM_VGA_H_
-
-/*
- * On the PC, we can just recalculate addresses and then
- * access the videoram directly without any black magic.
- */
-
-#define VGA_MAP_MEM(x,s) (unsigned long)phys_to_virt(x)
-
-#define vga_readb(x) (*(x))
-#define vga_writeb(x,y) (*(y) = (x))
-
-#endif
diff --git a/scripts/checksyscalls.sh b/scripts/checksyscalls.sh
index 0dcc01ce45a60..366f8c7f62bf6 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-i386/unistd.h) | \
+(ignore_list && syscall_list ${srctree}/include/asm-x86/unistd_32.h) | \
$* -E -x c - > /dev/null
--
GitLab