i386/x86_64: move headers to include/asm-x86
Thomas Gleixner [Thu, 11 Oct 2007 09:20:03 +0000 (11:20 +0200)]
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>

558 files changed:
Documentation/lguest/lguest.c
Kbuild
Makefile
arch/i386/Makefile
arch/ia64/ia32/audit.c
arch/um/sys-x86_64/syscall_table.c
arch/x86/ia32/audit.c
arch/x86/ia32/ipc32.c
arch/x86/kernel/cpu/mtrr/state.c
arch/x86/kernel/syscall_64.c
include/asm-i386/Kbuild [deleted file]
include/asm-i386/k8.h [deleted file]
include/asm-i386/pci-direct.h [deleted file]
include/asm-i386/stacktrace.h [deleted file]
include/asm-sh/mpc1211/mc146818rtc.h
include/asm-x86/8253pit.h [new file with mode: 0644]
include/asm-x86/8253pit_32.h [moved from include/asm-i386/8253pit.h with 100% similarity]
include/asm-x86/8253pit_64.h [moved from include/asm-x86_64/8253pit.h with 100% similarity]
include/asm-x86/Kbuild [new file with mode: 0644]
include/asm-x86/a.out.h [new file with mode: 0644]
include/asm-x86/a.out_32.h [moved from include/asm-i386/a.out.h with 100% similarity]
include/asm-x86/a.out_64.h [moved from include/asm-x86_64/a.out.h with 100% similarity]
include/asm-x86/acpi.h [new file with mode: 0644]
include/asm-x86/acpi_32.h [moved from include/asm-i386/acpi.h with 100% similarity]
include/asm-x86/acpi_64.h [moved from include/asm-x86_64/acpi.h with 100% similarity]
include/asm-x86/agp.h [new file with mode: 0644]
include/asm-x86/agp_32.h [moved from include/asm-i386/agp.h with 100% similarity]
include/asm-x86/agp_64.h [moved from include/asm-x86_64/agp.h with 100% similarity]
include/asm-x86/alternative-asm.i [new file with mode: 0644]
include/asm-x86/alternative-asm_32.i [moved from include/asm-i386/alternative-asm.i with 100% similarity]
include/asm-x86/alternative-asm_64.i [moved from include/asm-x86_64/alternative-asm.i with 100% similarity]
include/asm-x86/alternative.h [new file with mode: 0644]
include/asm-x86/alternative_32.h [moved from include/asm-i386/alternative.h with 100% similarity]
include/asm-x86/alternative_64.h [moved from include/asm-x86_64/alternative.h with 100% similarity]
include/asm-x86/apic.h [new file with mode: 0644]
include/asm-x86/apic_32.h [moved from include/asm-i386/apic.h with 100% similarity]
include/asm-x86/apic_64.h [moved from include/asm-x86_64/apic.h with 100% similarity]
include/asm-x86/apicdef.h [new file with mode: 0644]
include/asm-x86/apicdef_32.h [moved from include/asm-i386/apicdef.h with 100% similarity]
include/asm-x86/apicdef_64.h [moved from include/asm-x86_64/apicdef.h with 100% similarity]
include/asm-x86/arch_hooks.h [moved from include/asm-i386/arch_hooks.h with 100% similarity]
include/asm-x86/atomic.h [new file with mode: 0644]
include/asm-x86/atomic_32.h [moved from include/asm-i386/atomic.h with 100% similarity]
include/asm-x86/atomic_64.h [moved from include/asm-x86_64/atomic.h with 100% similarity]
include/asm-x86/auxvec.h [new file with mode: 0644]
include/asm-x86/auxvec_32.h [moved from include/asm-i386/auxvec.h with 100% similarity]
include/asm-x86/auxvec_64.h [moved from include/asm-x86_64/auxvec.h with 100% similarity]
include/asm-x86/bitops.h [new file with mode: 0644]
include/asm-x86/bitops_32.h [moved from include/asm-i386/bitops.h with 100% similarity]
include/asm-x86/bitops_64.h [moved from include/asm-x86_64/bitops.h with 100% similarity]
include/asm-x86/boot.h [moved from include/asm-i386/boot.h with 100% similarity]
include/asm-x86/bootparam.h [moved from include/asm-i386/bootparam.h with 100% similarity]
include/asm-x86/bootsetup.h [moved from include/asm-x86_64/bootsetup.h with 100% similarity]
include/asm-x86/bug.h [new file with mode: 0644]
include/asm-x86/bug_32.h [moved from include/asm-i386/bug.h with 100% similarity]
include/asm-x86/bug_64.h [moved from include/asm-x86_64/bug.h with 100% similarity]
include/asm-x86/bugs.h [new file with mode: 0644]
include/asm-x86/bugs_32.h [moved from include/asm-i386/bugs.h with 100% similarity]
include/asm-x86/bugs_64.h [moved from include/asm-x86_64/bugs.h with 100% similarity]
include/asm-x86/byteorder.h [new file with mode: 0644]
include/asm-x86/byteorder_32.h [moved from include/asm-i386/byteorder.h with 100% similarity]
include/asm-x86/byteorder_64.h [moved from include/asm-x86_64/byteorder.h with 100% similarity]
include/asm-x86/cache.h [new file with mode: 0644]
include/asm-x86/cache_32.h [moved from include/asm-i386/cache.h with 100% similarity]
include/asm-x86/cache_64.h [moved from include/asm-x86_64/cache.h with 100% similarity]
include/asm-x86/cacheflush.h [new file with mode: 0644]
include/asm-x86/cacheflush_32.h [moved from include/asm-i386/cacheflush.h with 100% similarity]
include/asm-x86/cacheflush_64.h [moved from include/asm-x86_64/cacheflush.h with 100% similarity]
include/asm-x86/calgary.h [moved from include/asm-x86_64/calgary.h with 100% similarity]
include/asm-x86/calling.h [moved from include/asm-x86_64/calling.h with 100% similarity]
include/asm-x86/checksum.h [new file with mode: 0644]
include/asm-x86/checksum_32.h [moved from include/asm-i386/checksum.h with 100% similarity]
include/asm-x86/checksum_64.h [moved from include/asm-x86_64/checksum.h with 100% similarity]
include/asm-x86/cmpxchg.h [new file with mode: 0644]
include/asm-x86/cmpxchg_32.h [moved from include/asm-i386/cmpxchg.h with 100% similarity]
include/asm-x86/cmpxchg_64.h [moved from include/asm-x86_64/cmpxchg.h with 100% similarity]
include/asm-x86/compat.h [moved from include/asm-x86_64/compat.h with 100% similarity]
include/asm-x86/cpu.h [moved from include/asm-i386/cpu.h with 100% similarity]
include/asm-x86/cpufeature.h [new file with mode: 0644]
include/asm-x86/cpufeature_32.h [moved from include/asm-i386/cpufeature.h with 100% similarity]
include/asm-x86/cpufeature_64.h [new file with mode: 0644]
include/asm-x86/cputime.h [new file with mode: 0644]
include/asm-x86/cputime_32.h [moved from include/asm-i386/cputime.h with 100% similarity]
include/asm-x86/cputime_64.h [moved from include/asm-x86_64/cputime.h with 100% similarity]
include/asm-x86/current.h [new file with mode: 0644]
include/asm-x86/current_32.h [moved from include/asm-i386/current.h with 100% similarity]
include/asm-x86/current_64.h [moved from include/asm-x86_64/current.h with 100% similarity]
include/asm-x86/debugreg.h [new file with mode: 0644]
include/asm-x86/debugreg_32.h [moved from include/asm-i386/debugreg.h with 100% similarity]
include/asm-x86/debugreg_64.h [moved from include/asm-x86_64/debugreg.h with 100% similarity]
include/asm-x86/delay.h [new file with mode: 0644]
include/asm-x86/delay_32.h [moved from include/asm-i386/delay.h with 100% similarity]
include/asm-x86/delay_64.h [moved from include/asm-x86_64/delay.h with 100% similarity]
include/asm-x86/desc.h [new file with mode: 0644]
include/asm-x86/desc_32.h [moved from include/asm-i386/desc.h with 100% similarity]
include/asm-x86/desc_64.h [moved from include/asm-x86_64/desc.h with 100% similarity]
include/asm-x86/desc_defs.h [moved from include/asm-x86_64/desc_defs.h with 100% similarity]
include/asm-x86/device.h [new file with mode: 0644]
include/asm-x86/device_32.h [moved from include/asm-i386/device.h with 100% similarity]
include/asm-x86/device_64.h [moved from include/asm-x86_64/device.h with 100% similarity]
include/asm-x86/div64.h [new file with mode: 0644]
include/asm-x86/div64_32.h [moved from include/asm-i386/div64.h with 100% similarity]
include/asm-x86/div64_64.h [moved from include/asm-x86_64/div64.h with 100% similarity]
include/asm-x86/dma-mapping.h [new file with mode: 0644]
include/asm-x86/dma-mapping_32.h [moved from include/asm-i386/dma-mapping.h with 100% similarity]
include/asm-x86/dma-mapping_64.h [moved from include/asm-x86_64/dma-mapping.h with 100% similarity]
include/asm-x86/dma.h [new file with mode: 0644]
include/asm-x86/dma_32.h [moved from include/asm-i386/dma.h with 100% similarity]
include/asm-x86/dma_64.h [moved from include/asm-x86_64/dma.h with 100% similarity]
include/asm-x86/dmi.h [new file with mode: 0644]
include/asm-x86/dmi_32.h [moved from include/asm-i386/dmi.h with 100% similarity]
include/asm-x86/dmi_64.h [moved from include/asm-x86_64/dmi.h with 100% similarity]
include/asm-x86/dwarf2.h [new file with mode: 0644]
include/asm-x86/dwarf2_32.h [moved from include/asm-i386/dwarf2.h with 100% similarity]
include/asm-x86/dwarf2_64.h [moved from include/asm-x86_64/dwarf2.h with 100% similarity]
include/asm-x86/e820.h [new file with mode: 0644]
include/asm-x86/e820_32.h [moved from include/asm-i386/e820.h with 100% similarity]
include/asm-x86/e820_64.h [moved from include/asm-x86_64/e820.h with 100% similarity]
include/asm-x86/edac.h [new file with mode: 0644]
include/asm-x86/edac_32.h [moved from include/asm-i386/edac.h with 100% similarity]
include/asm-x86/edac_64.h [moved from include/asm-x86_64/edac.h with 100% similarity]
include/asm-x86/elf.h [new file with mode: 0644]
include/asm-x86/elf_32.h [moved from include/asm-i386/elf.h with 100% similarity]
include/asm-x86/elf_64.h [moved from include/asm-x86_64/elf.h with 100% similarity]
include/asm-x86/emergency-restart.h [moved from include/asm-i386/emergency-restart.h with 100% similarity]
include/asm-x86/errno.h [new file with mode: 0644]
include/asm-x86/errno_32.h [moved from include/asm-i386/errno.h with 100% similarity]
include/asm-x86/errno_64.h [moved from include/asm-x86_64/errno.h with 100% similarity]
include/asm-x86/fb.h [new file with mode: 0644]
include/asm-x86/fb_32.h [moved from include/asm-i386/fb.h with 100% similarity]
include/asm-x86/fb_64.h [moved from include/asm-x86_64/fb.h with 100% similarity]
include/asm-x86/fcntl.h [moved from include/asm-i386/fcntl.h with 100% similarity]
include/asm-x86/fixmap.h [new file with mode: 0644]
include/asm-x86/fixmap_32.h [moved from include/asm-i386/fixmap.h with 100% similarity]
include/asm-x86/fixmap_64.h [moved from include/asm-x86_64/fixmap.h with 100% similarity]
include/asm-x86/floppy.h [new file with mode: 0644]
include/asm-x86/floppy_32.h [moved from include/asm-i386/floppy.h with 100% similarity]
include/asm-x86/floppy_64.h [moved from include/asm-x86_64/floppy.h with 100% similarity]
include/asm-x86/fpu32.h [moved from include/asm-x86_64/fpu32.h with 100% similarity]
include/asm-x86/frame.i [moved from include/asm-i386/frame.i with 100% similarity]
include/asm-x86/futex.h [new file with mode: 0644]
include/asm-x86/futex_32.h [moved from include/asm-i386/futex.h with 100% similarity]
include/asm-x86/futex_64.h [moved from include/asm-x86_64/futex.h with 100% similarity]
include/asm-x86/genapic.h [new file with mode: 0644]
include/asm-x86/genapic_32.h [moved from include/asm-i386/genapic.h with 100% similarity]
include/asm-x86/genapic_64.h [moved from include/asm-x86_64/genapic.h with 100% similarity]
include/asm-x86/geode.h [moved from include/asm-i386/geode.h with 100% similarity]
include/asm-x86/hardirq.h [new file with mode: 0644]
include/asm-x86/hardirq_32.h [moved from include/asm-i386/hardirq.h with 100% similarity]
include/asm-x86/hardirq_64.h [moved from include/asm-x86_64/hardirq.h with 100% similarity]
include/asm-x86/highmem.h [moved from include/asm-i386/highmem.h with 100% similarity]
include/asm-x86/hpet.h [new file with mode: 0644]
include/asm-x86/hpet_32.h [moved from include/asm-i386/hpet.h with 100% similarity]
include/asm-x86/hpet_64.h [new file with mode: 0644]
include/asm-x86/hw_irq.h [new file with mode: 0644]
include/asm-x86/hw_irq_32.h [moved from include/asm-i386/hw_irq.h with 100% similarity]
include/asm-x86/hw_irq_64.h [moved from include/asm-x86_64/hw_irq.h with 100% similarity]
include/asm-x86/hypertransport.h [moved from include/asm-i386/hypertransport.h with 100% similarity]
include/asm-x86/i387.h [new file with mode: 0644]
include/asm-x86/i387_32.h [moved from include/asm-i386/i387.h with 100% similarity]
include/asm-x86/i387_64.h [moved from include/asm-x86_64/i387.h with 100% similarity]
include/asm-x86/i8253.h [new file with mode: 0644]
include/asm-x86/i8253_32.h [moved from include/asm-i386/i8253.h with 100% similarity]
include/asm-x86/i8253_64.h [moved from include/asm-x86_64/i8253.h with 100% similarity]
include/asm-x86/i8259.h [moved from include/asm-i386/i8259.h with 100% similarity]
include/asm-x86/ia32.h [moved from include/asm-x86_64/ia32.h with 100% similarity]
include/asm-x86/ia32_unistd.h [moved from include/asm-x86_64/ia32_unistd.h with 100% similarity]
include/asm-x86/ide.h [moved from include/asm-i386/ide.h with 100% similarity]
include/asm-x86/idle.h [moved from include/asm-x86_64/idle.h with 100% similarity]
include/asm-x86/intel_arch_perfmon.h [new file with mode: 0644]
include/asm-x86/intel_arch_perfmon_32.h [moved from include/asm-i386/intel_arch_perfmon.h with 100% similarity]
include/asm-x86/intel_arch_perfmon_64.h [moved from include/asm-x86_64/intel_arch_perfmon.h with 100% similarity]
include/asm-x86/io.h [new file with mode: 0644]
include/asm-x86/io_32.h [moved from include/asm-i386/io.h with 100% similarity]
include/asm-x86/io_64.h [moved from include/asm-x86_64/io.h with 100% similarity]
include/asm-x86/io_apic.h [new file with mode: 0644]
include/asm-x86/io_apic_32.h [moved from include/asm-i386/io_apic.h with 100% similarity]
include/asm-x86/io_apic_64.h [moved from include/asm-x86_64/io_apic.h with 100% similarity]
include/asm-x86/ioctl.h [moved from include/asm-i386/ioctl.h with 100% similarity]
include/asm-x86/ioctls.h [new file with mode: 0644]
include/asm-x86/ioctls_32.h [moved from include/asm-i386/ioctls.h with 100% similarity]
include/asm-x86/ioctls_64.h [moved from include/asm-x86_64/ioctls.h with 100% similarity]
include/asm-x86/iommu.h [moved from include/asm-x86_64/iommu.h with 100% similarity]
include/asm-x86/ipc.h [moved from include/asm-i386/ipc.h with 100% similarity]
include/asm-x86/ipcbuf.h [new file with mode: 0644]
include/asm-x86/ipcbuf_32.h [moved from include/asm-i386/ipcbuf.h with 100% similarity]
include/asm-x86/ipcbuf_64.h [moved from include/asm-x86_64/ipcbuf.h with 100% similarity]
include/asm-x86/ipi.h [moved from include/asm-x86_64/ipi.h with 100% similarity]
include/asm-x86/irq.h [new file with mode: 0644]
include/asm-x86/irq_32.h [moved from include/asm-i386/irq.h with 100% similarity]
include/asm-x86/irq_64.h [moved from include/asm-x86_64/irq.h with 100% similarity]
include/asm-x86/irq_regs.h [new file with mode: 0644]
include/asm-x86/irq_regs_32.h [moved from include/asm-i386/irq_regs.h with 100% similarity]
include/asm-x86/irq_regs_64.h [moved from include/asm-x86_64/irq_regs.h with 100% similarity]
include/asm-x86/irqflags.h [new file with mode: 0644]
include/asm-x86/irqflags_32.h [moved from include/asm-i386/irqflags.h with 100% similarity]
include/asm-x86/irqflags_64.h [moved from include/asm-x86_64/irqflags.h with 100% similarity]
include/asm-x86/ist.h [moved from include/asm-i386/ist.h with 100% similarity]
include/asm-x86/k8.h [moved from include/asm-x86_64/k8.h with 100% similarity]
include/asm-x86/kdebug.h [new file with mode: 0644]
include/asm-x86/kdebug_32.h [moved from include/asm-i386/kdebug.h with 100% similarity]
include/asm-x86/kdebug_64.h [moved from include/asm-x86_64/kdebug.h with 100% similarity]
include/asm-x86/kexec.h [new file with mode: 0644]
include/asm-x86/kexec_32.h [moved from include/asm-i386/kexec.h with 100% similarity]
include/asm-x86/kexec_64.h [moved from include/asm-x86_64/kexec.h with 100% similarity]
include/asm-x86/kmap_types.h [new file with mode: 0644]
include/asm-x86/kmap_types_32.h [moved from include/asm-i386/kmap_types.h with 100% similarity]
include/asm-x86/kmap_types_64.h [moved from include/asm-x86_64/kmap_types.h with 100% similarity]
include/asm-x86/kprobes.h [new file with mode: 0644]
include/asm-x86/kprobes_32.h [moved from include/asm-i386/kprobes.h with 100% similarity]
include/asm-x86/kprobes_64.h [moved from include/asm-x86_64/kprobes.h with 100% similarity]
include/asm-x86/ldt.h [new file with mode: 0644]
include/asm-x86/ldt_32.h [moved from include/asm-i386/ldt.h with 100% similarity]
include/asm-x86/ldt_64.h [moved from include/asm-x86_64/ldt.h with 100% similarity]
include/asm-x86/linkage.h [new file with mode: 0644]
include/asm-x86/linkage_32.h [moved from include/asm-i386/linkage.h with 100% similarity]
include/asm-x86/linkage_64.h [moved from include/asm-x86_64/linkage.h with 100% similarity]
include/asm-x86/local.h [new file with mode: 0644]
include/asm-x86/local_32.h [moved from include/asm-i386/local.h with 100% similarity]
include/asm-x86/local_64.h [moved from include/asm-x86_64/local.h with 100% similarity]
include/asm-x86/mach-bigsmp/mach_apic.h [moved from include/asm-i386/mach-bigsmp/mach_apic.h with 100% similarity]
include/asm-x86/mach-bigsmp/mach_apicdef.h [moved from include/asm-i386/mach-bigsmp/mach_apicdef.h with 100% similarity]
include/asm-x86/mach-bigsmp/mach_ipi.h [moved from include/asm-i386/mach-bigsmp/mach_ipi.h with 100% similarity]
include/asm-x86/mach-bigsmp/mach_mpspec.h [moved from include/asm-i386/mach-bigsmp/mach_mpspec.h with 100% similarity]
include/asm-x86/mach-default/apm.h [moved from include/asm-i386/mach-default/apm.h with 100% similarity]
include/asm-x86/mach-default/bios_ebda.h [moved from include/asm-i386/mach-default/bios_ebda.h with 100% similarity]
include/asm-x86/mach-default/do_timer.h [moved from include/asm-i386/mach-default/do_timer.h with 100% similarity]
include/asm-x86/mach-default/entry_arch.h [moved from include/asm-i386/mach-default/entry_arch.h with 100% similarity]
include/asm-x86/mach-default/io_ports.h [moved from include/asm-i386/mach-default/io_ports.h with 100% similarity]
include/asm-x86/mach-default/irq_vectors.h [moved from include/asm-i386/mach-default/irq_vectors.h with 100% similarity]
include/asm-x86/mach-default/irq_vectors_limits.h [moved from include/asm-i386/mach-default/irq_vectors_limits.h with 100% similarity]
include/asm-x86/mach-default/mach_apic.h [moved from include/asm-i386/mach-default/mach_apic.h with 100% similarity]
include/asm-x86/mach-default/mach_apicdef.h [moved from include/asm-i386/mach-default/mach_apicdef.h with 100% similarity]
include/asm-x86/mach-default/mach_ipi.h [moved from include/asm-i386/mach-default/mach_ipi.h with 100% similarity]
include/asm-x86/mach-default/mach_mpparse.h [moved from include/asm-i386/mach-default/mach_mpparse.h with 100% similarity]
include/asm-x86/mach-default/mach_mpspec.h [moved from include/asm-i386/mach-default/mach_mpspec.h with 100% similarity]
include/asm-x86/mach-default/mach_reboot.h [moved from include/asm-i386/mach-default/mach_reboot.h with 100% similarity]
include/asm-x86/mach-default/mach_time.h [moved from include/asm-i386/mach-default/mach_time.h with 100% similarity]
include/asm-x86/mach-default/mach_timer.h [moved from include/asm-i386/mach-default/mach_timer.h with 100% similarity]
include/asm-x86/mach-default/mach_traps.h [moved from include/asm-i386/mach-default/mach_traps.h with 100% similarity]
include/asm-x86/mach-default/mach_wakecpu.h [moved from include/asm-i386/mach-default/mach_wakecpu.h with 100% similarity]
include/asm-x86/mach-default/pci-functions.h [moved from include/asm-i386/mach-default/pci-functions.h with 100% similarity]
include/asm-x86/mach-default/setup_arch.h [moved from include/asm-i386/mach-default/setup_arch.h with 100% similarity]
include/asm-x86/mach-default/smpboot_hooks.h [moved from include/asm-i386/mach-default/smpboot_hooks.h with 100% similarity]
include/asm-x86/mach-es7000/mach_apic.h [moved from include/asm-i386/mach-es7000/mach_apic.h with 100% similarity]
include/asm-x86/mach-es7000/mach_apicdef.h [moved from include/asm-i386/mach-es7000/mach_apicdef.h with 100% similarity]
include/asm-x86/mach-es7000/mach_ipi.h [moved from include/asm-i386/mach-es7000/mach_ipi.h with 100% similarity]
include/asm-x86/mach-es7000/mach_mpparse.h [moved from include/asm-i386/mach-es7000/mach_mpparse.h with 100% similarity]
include/asm-x86/mach-es7000/mach_mpspec.h [moved from include/asm-i386/mach-es7000/mach_mpspec.h with 100% similarity]
include/asm-x86/mach-es7000/mach_wakecpu.h [moved from include/asm-i386/mach-es7000/mach_wakecpu.h with 100% similarity]
include/asm-x86/mach-generic/irq_vectors_limits.h [moved from include/asm-i386/mach-generic/irq_vectors_limits.h with 100% similarity]
include/asm-x86/mach-generic/mach_apic.h [moved from include/asm-i386/mach-generic/mach_apic.h with 100% similarity]
include/asm-x86/mach-generic/mach_apicdef.h [moved from include/asm-i386/mach-generic/mach_apicdef.h with 100% similarity]
include/asm-x86/mach-generic/mach_ipi.h [moved from include/asm-i386/mach-generic/mach_ipi.h with 100% similarity]
include/asm-x86/mach-generic/mach_mpparse.h [moved from include/asm-i386/mach-generic/mach_mpparse.h with 100% similarity]
include/asm-x86/mach-generic/mach_mpspec.h [moved from include/asm-i386/mach-generic/mach_mpspec.h with 100% similarity]
include/asm-x86/mach-numaq/mach_apic.h [moved from include/asm-i386/mach-numaq/mach_apic.h with 100% similarity]
include/asm-x86/mach-numaq/mach_apicdef.h [moved from include/asm-i386/mach-numaq/mach_apicdef.h with 100% similarity]
include/asm-x86/mach-numaq/mach_ipi.h [moved from include/asm-i386/mach-numaq/mach_ipi.h with 100% similarity]
include/asm-x86/mach-numaq/mach_mpparse.h [moved from include/asm-i386/mach-numaq/mach_mpparse.h with 100% similarity]
include/asm-x86/mach-numaq/mach_mpspec.h [moved from include/asm-i386/mach-numaq/mach_mpspec.h with 100% similarity]
include/asm-x86/mach-numaq/mach_wakecpu.h [moved from include/asm-i386/mach-numaq/mach_wakecpu.h with 100% similarity]
include/asm-x86/mach-summit/irq_vectors_limits.h [moved from include/asm-i386/mach-summit/irq_vectors_limits.h with 100% similarity]
include/asm-x86/mach-summit/mach_apic.h [moved from include/asm-i386/mach-summit/mach_apic.h with 100% similarity]
include/asm-x86/mach-summit/mach_apicdef.h [moved from include/asm-i386/mach-summit/mach_apicdef.h with 100% similarity]
include/asm-x86/mach-summit/mach_ipi.h [moved from include/asm-i386/mach-summit/mach_ipi.h with 100% similarity]
include/asm-x86/mach-summit/mach_mpparse.h [moved from include/asm-i386/mach-summit/mach_mpparse.h with 100% similarity]
include/asm-x86/mach-summit/mach_mpspec.h [moved from include/asm-i386/mach-summit/mach_mpspec.h with 100% similarity]
include/asm-x86/mach-visws/cobalt.h [moved from include/asm-i386/mach-visws/cobalt.h with 100% similarity]
include/asm-x86/mach-visws/entry_arch.h [moved from include/asm-i386/mach-visws/entry_arch.h with 100% similarity]
include/asm-x86/mach-visws/irq_vectors.h [moved from include/asm-i386/mach-visws/irq_vectors.h with 100% similarity]
include/asm-x86/mach-visws/lithium.h [moved from include/asm-i386/mach-visws/lithium.h with 100% similarity]
include/asm-x86/mach-visws/mach_apic.h [moved from include/asm-i386/mach-visws/mach_apic.h with 100% similarity]
include/asm-x86/mach-visws/mach_apicdef.h [moved from include/asm-i386/mach-visws/mach_apicdef.h with 100% similarity]
include/asm-x86/mach-visws/piix4.h [moved from include/asm-i386/mach-visws/piix4.h with 100% similarity]
include/asm-x86/mach-visws/setup_arch.h [moved from include/asm-i386/mach-visws/setup_arch.h with 100% similarity]
include/asm-x86/mach-visws/smpboot_hooks.h [moved from include/asm-i386/mach-visws/smpboot_hooks.h with 100% similarity]
include/asm-x86/mach-voyager/do_timer.h [moved from include/asm-i386/mach-voyager/do_timer.h with 100% similarity]
include/asm-x86/mach-voyager/entry_arch.h [moved from include/asm-i386/mach-voyager/entry_arch.h with 100% similarity]
include/asm-x86/mach-voyager/irq_vectors.h [moved from include/asm-i386/mach-voyager/irq_vectors.h with 100% similarity]
include/asm-x86/mach-voyager/setup_arch.h [moved from include/asm-i386/mach-voyager/setup_arch.h with 100% similarity]
include/asm-x86/mach_apic.h [moved from include/asm-x86_64/mach_apic.h with 100% similarity]
include/asm-x86/math_emu.h [moved from include/asm-i386/math_emu.h with 100% similarity]
include/asm-x86/mc146818rtc.h [new file with mode: 0644]
include/asm-x86/mc146818rtc_32.h [moved from include/asm-i386/mc146818rtc.h with 100% similarity]
include/asm-x86/mc146818rtc_64.h [moved from include/asm-x86_64/mc146818rtc.h with 100% similarity]
include/asm-x86/mca.h [moved from include/asm-i386/mca.h with 100% similarity]
include/asm-x86/mca_dma.h [moved from include/asm-i386/mca_dma.h with 100% similarity]
include/asm-x86/mce.h [new file with mode: 0644]
include/asm-x86/mce_32.h [moved from include/asm-i386/mce.h with 100% similarity]
include/asm-x86/mce_64.h [moved from include/asm-x86_64/mce.h with 100% similarity]
include/asm-x86/mman.h [new file with mode: 0644]
include/asm-x86/mman_32.h [moved from include/asm-i386/mman.h with 100% similarity]
include/asm-x86/mman_64.h [moved from include/asm-x86_64/mman.h with 100% similarity]
include/asm-x86/mmsegment.h [moved from include/asm-x86_64/mmsegment.h with 100% similarity]
include/asm-x86/mmu.h [new file with mode: 0644]
include/asm-x86/mmu_32.h [moved from include/asm-i386/mmu.h with 100% similarity]
include/asm-x86/mmu_64.h [moved from include/asm-x86_64/mmu.h with 100% similarity]
include/asm-x86/mmu_context.h [new file with mode: 0644]
include/asm-x86/mmu_context_32.h [moved from include/asm-i386/mmu_context.h with 100% similarity]
include/asm-x86/mmu_context_64.h [moved from include/asm-x86_64/mmu_context.h with 100% similarity]
include/asm-x86/mmx.h [moved from include/asm-i386/mmx.h with 100% similarity]
include/asm-x86/mmzone.h [new file with mode: 0644]
include/asm-x86/mmzone_32.h [moved from include/asm-i386/mmzone.h with 100% similarity]
include/asm-x86/mmzone_64.h [moved from include/asm-x86_64/mmzone.h with 100% similarity]
include/asm-x86/module.h [new file with mode: 0644]
include/asm-x86/module_32.h [moved from include/asm-i386/module.h with 100% similarity]
include/asm-x86/module_64.h [moved from include/asm-x86_64/module.h with 100% similarity]
include/asm-x86/mpspec.h [new file with mode: 0644]
include/asm-x86/mpspec_32.h [moved from include/asm-i386/mpspec.h with 100% similarity]
include/asm-x86/mpspec_64.h [moved from include/asm-x86_64/mpspec.h with 100% similarity]
include/asm-x86/mpspec_def.h [moved from include/asm-i386/mpspec_def.h with 100% similarity]
include/asm-x86/msgbuf.h [new file with mode: 0644]
include/asm-x86/msgbuf_32.h [moved from include/asm-i386/msgbuf.h with 100% similarity]
include/asm-x86/msgbuf_64.h [moved from include/asm-x86_64/msgbuf.h with 100% similarity]
include/asm-x86/msidef.h [moved from include/asm-i386/msidef.h with 100% similarity]
include/asm-x86/msr-index.h [moved from include/asm-i386/msr-index.h with 100% similarity]
include/asm-x86/msr.h [new file with mode: 0644]
include/asm-x86/msr_32.h [moved from include/asm-i386/msr.h with 100% similarity]
include/asm-x86/msr_64.h [moved from include/asm-x86_64/msr.h with 100% similarity]
include/asm-x86/mtrr.h [new file with mode: 0644]
include/asm-x86/mtrr_32.h [moved from include/asm-i386/mtrr.h with 100% similarity]
include/asm-x86/mtrr_64.h [moved from include/asm-x86_64/mtrr.h with 100% similarity]
include/asm-x86/mutex.h [new file with mode: 0644]
include/asm-x86/mutex_32.h [moved from include/asm-i386/mutex.h with 100% similarity]
include/asm-x86/mutex_64.h [moved from include/asm-x86_64/mutex.h with 100% similarity]
include/asm-x86/namei.h [new file with mode: 0644]
include/asm-x86/namei_32.h [moved from include/asm-i386/namei.h with 100% similarity]
include/asm-x86/namei_64.h [moved from include/asm-x86_64/namei.h with 100% similarity]
include/asm-x86/nmi.h [new file with mode: 0644]
include/asm-x86/nmi_32.h [moved from include/asm-i386/nmi.h with 100% similarity]
include/asm-x86/nmi_64.h [moved from include/asm-x86_64/nmi.h with 100% similarity]
include/asm-x86/numa.h [new file with mode: 0644]
include/asm-x86/numa_32.h [moved from include/asm-i386/numa.h with 100% similarity]
include/asm-x86/numa_64.h [moved from include/asm-x86_64/numa.h with 100% similarity]
include/asm-x86/numaq.h [moved from include/asm-i386/numaq.h with 100% similarity]
include/asm-x86/page.h [new file with mode: 0644]
include/asm-x86/page_32.h [moved from include/asm-i386/page.h with 100% similarity]
include/asm-x86/page_64.h [moved from include/asm-x86_64/page.h with 100% similarity]
include/asm-x86/param.h [new file with mode: 0644]
include/asm-x86/param_32.h [moved from include/asm-i386/param.h with 100% similarity]
include/asm-x86/param_64.h [moved from include/asm-x86_64/param.h with 100% similarity]
include/asm-x86/paravirt.h [moved from include/asm-i386/paravirt.h with 100% similarity]
include/asm-x86/parport.h [new file with mode: 0644]
include/asm-x86/parport_32.h [moved from include/asm-i386/parport.h with 100% similarity]
include/asm-x86/parport_64.h [moved from include/asm-x86_64/parport.h with 100% similarity]
include/asm-x86/pci-direct.h [moved from include/asm-x86_64/pci-direct.h with 100% similarity]
include/asm-x86/pci.h [new file with mode: 0644]
include/asm-x86/pci_32.h [moved from include/asm-i386/pci.h with 100% similarity]
include/asm-x86/pci_64.h [moved from include/asm-x86_64/pci.h with 100% similarity]
include/asm-x86/pda.h [moved from include/asm-x86_64/pda.h with 100% similarity]
include/asm-x86/percpu.h [new file with mode: 0644]
include/asm-x86/percpu_32.h [moved from include/asm-i386/percpu.h with 100% similarity]
include/asm-x86/percpu_64.h [moved from include/asm-x86_64/percpu.h with 100% similarity]
include/asm-x86/pgalloc.h [new file with mode: 0644]
include/asm-x86/pgalloc_32.h [moved from include/asm-i386/pgalloc.h with 100% similarity]
include/asm-x86/pgalloc_64.h [moved from include/asm-x86_64/pgalloc.h with 100% similarity]
include/asm-x86/pgtable-2level-defs.h [moved from include/asm-i386/pgtable-2level-defs.h with 100% similarity]
include/asm-x86/pgtable-2level.h [moved from include/asm-i386/pgtable-2level.h with 100% similarity]
include/asm-x86/pgtable-3level-defs.h [moved from include/asm-i386/pgtable-3level-defs.h with 100% similarity]
include/asm-x86/pgtable-3level.h [moved from include/asm-i386/pgtable-3level.h with 100% similarity]
include/asm-x86/pgtable.h [new file with mode: 0644]
include/asm-x86/pgtable_32.h [moved from include/asm-i386/pgtable.h with 100% similarity]
include/asm-x86/pgtable_64.h [moved from include/asm-x86_64/pgtable.h with 100% similarity]
include/asm-x86/poll.h [moved from include/asm-i386/poll.h with 100% similarity]
include/asm-x86/posix_types.h [new file with mode: 0644]
include/asm-x86/posix_types_32.h [moved from include/asm-i386/posix_types.h with 100% similarity]
include/asm-x86/posix_types_64.h [moved from include/asm-x86_64/posix_types.h with 100% similarity]
include/asm-x86/prctl.h [moved from include/asm-x86_64/prctl.h with 100% similarity]
include/asm-x86/processor-cyrix.h [moved from include/asm-i386/processor-cyrix.h with 100% similarity]
include/asm-x86/processor-flags.h [moved from include/asm-i386/processor-flags.h with 100% similarity]
include/asm-x86/processor.h [new file with mode: 0644]
include/asm-x86/processor_32.h [moved from include/asm-i386/processor.h with 100% similarity]
include/asm-x86/processor_64.h [moved from include/asm-x86_64/processor.h with 100% similarity]
include/asm-x86/proto.h [moved from include/asm-x86_64/proto.h with 100% similarity]
include/asm-x86/ptrace-abi.h [new file with mode: 0644]
include/asm-x86/ptrace-abi_32.h [moved from include/asm-i386/ptrace-abi.h with 100% similarity]
include/asm-x86/ptrace-abi_64.h [moved from include/asm-x86_64/ptrace-abi.h with 100% similarity]
include/asm-x86/ptrace.h [new file with mode: 0644]
include/asm-x86/ptrace_32.h [moved from include/asm-i386/ptrace.h with 100% similarity]
include/asm-x86/ptrace_64.h [moved from include/asm-x86_64/ptrace.h with 100% similarity]
include/asm-x86/reboot.h [moved from include/asm-i386/reboot.h with 100% similarity]
include/asm-x86/reboot_fixups.h [moved from include/asm-i386/reboot_fixups.h with 100% similarity]
include/asm-x86/required-features.h [new file with mode: 0644]
include/asm-x86/required-features_32.h [moved from include/asm-i386/required-features.h with 100% similarity]
include/asm-x86/required-features_64.h [moved from include/asm-x86_64/required-features.h with 100% similarity]
include/asm-x86/resource.h [new file with mode: 0644]
include/asm-x86/resource_32.h [moved from include/asm-i386/resource.h with 100% similarity]
include/asm-x86/resource_64.h [moved from include/asm-x86_64/resource.h with 100% similarity]
include/asm-x86/resume-trace.h [new file with mode: 0644]
include/asm-x86/resume-trace_32.h [moved from include/asm-i386/resume-trace.h with 100% similarity]
include/asm-x86/resume-trace_64.h [moved from include/asm-x86_64/resume-trace.h with 100% similarity]
include/asm-x86/rio.h [moved from include/asm-x86_64/rio.h with 100% similarity]
include/asm-x86/rtc.h [new file with mode: 0644]
include/asm-x86/rtc_32.h [moved from include/asm-i386/rtc.h with 100% similarity]
include/asm-x86/rtc_64.h [moved from include/asm-x86_64/rtc.h with 100% similarity]
include/asm-x86/rwlock.h [new file with mode: 0644]
include/asm-x86/rwlock_32.h [moved from include/asm-i386/rwlock.h with 100% similarity]
include/asm-x86/rwlock_64.h [moved from include/asm-x86_64/rwlock.h with 100% similarity]
include/asm-x86/rwsem.h [moved from include/asm-i386/rwsem.h with 100% similarity]
include/asm-x86/scatterlist.h [new file with mode: 0644]
include/asm-x86/scatterlist_32.h [moved from include/asm-i386/scatterlist.h with 100% similarity]
include/asm-x86/scatterlist_64.h [moved from include/asm-x86_64/scatterlist.h with 100% similarity]
include/asm-x86/seccomp.h [new file with mode: 0644]
include/asm-x86/seccomp_32.h [moved from include/asm-i386/seccomp.h with 100% similarity]
include/asm-x86/seccomp_64.h [moved from include/asm-x86_64/seccomp.h with 100% similarity]
include/asm-x86/sections.h [new file with mode: 0644]
include/asm-x86/sections_32.h [moved from include/asm-i386/sections.h with 100% similarity]
include/asm-x86/sections_64.h [moved from include/asm-x86_64/sections.h with 100% similarity]
include/asm-x86/segment.h [new file with mode: 0644]
include/asm-x86/segment_32.h [moved from include/asm-i386/segment.h with 100% similarity]
include/asm-x86/segment_64.h [moved from include/asm-x86_64/segment.h with 100% similarity]
include/asm-x86/semaphore.h [new file with mode: 0644]
include/asm-x86/semaphore_32.h [moved from include/asm-i386/semaphore.h with 100% similarity]
include/asm-x86/semaphore_64.h [moved from include/asm-x86_64/semaphore.h with 100% similarity]
include/asm-x86/sembuf.h [new file with mode: 0644]
include/asm-x86/sembuf_32.h [moved from include/asm-i386/sembuf.h with 100% similarity]
include/asm-x86/sembuf_64.h [moved from include/asm-x86_64/sembuf.h with 100% similarity]
include/asm-x86/serial.h [new file with mode: 0644]
include/asm-x86/serial_32.h [moved from include/asm-i386/serial.h with 100% similarity]
include/asm-x86/serial_64.h [moved from include/asm-x86_64/serial.h with 100% similarity]
include/asm-x86/setup.h [new file with mode: 0644]
include/asm-x86/setup_32.h [moved from include/asm-i386/setup.h with 100% similarity]
include/asm-x86/setup_64.h [moved from include/asm-x86_64/setup.h with 100% similarity]
include/asm-x86/shmbuf.h [new file with mode: 0644]
include/asm-x86/shmbuf_32.h [moved from include/asm-i386/shmbuf.h with 100% similarity]
include/asm-x86/shmbuf_64.h [moved from include/asm-x86_64/shmbuf.h with 100% similarity]
include/asm-x86/shmparam.h [new file with mode: 0644]
include/asm-x86/shmparam_32.h [moved from include/asm-i386/shmparam.h with 100% similarity]
include/asm-x86/shmparam_64.h [moved from include/asm-x86_64/shmparam.h with 100% similarity]
include/asm-x86/sigcontext.h [new file with mode: 0644]
include/asm-x86/sigcontext32.h [moved from include/asm-x86_64/sigcontext32.h with 100% similarity]
include/asm-x86/sigcontext_32.h [moved from include/asm-i386/sigcontext.h with 100% similarity]
include/asm-x86/sigcontext_64.h [moved from include/asm-x86_64/sigcontext.h with 100% similarity]
include/asm-x86/siginfo.h [new file with mode: 0644]
include/asm-x86/siginfo_32.h [moved from include/asm-i386/siginfo.h with 100% similarity]
include/asm-x86/siginfo_64.h [moved from include/asm-x86_64/siginfo.h with 100% similarity]
include/asm-x86/signal.h [new file with mode: 0644]
include/asm-x86/signal_32.h [moved from include/asm-i386/signal.h with 100% similarity]
include/asm-x86/signal_64.h [moved from include/asm-x86_64/signal.h with 100% similarity]
include/asm-x86/smp.h [new file with mode: 0644]
include/asm-x86/smp_32.h [moved from include/asm-i386/smp.h with 100% similarity]
include/asm-x86/smp_64.h [moved from include/asm-x86_64/smp.h with 100% similarity]
include/asm-x86/socket.h [moved from include/asm-i386/socket.h with 100% similarity]
include/asm-x86/sockios.h [new file with mode: 0644]
include/asm-x86/sockios_32.h [moved from include/asm-i386/sockios.h with 100% similarity]
include/asm-x86/sockios_64.h [moved from include/asm-x86_64/sockios.h with 100% similarity]
include/asm-x86/sparsemem.h [new file with mode: 0644]
include/asm-x86/sparsemem_32.h [moved from include/asm-i386/sparsemem.h with 100% similarity]
include/asm-x86/sparsemem_64.h [moved from include/asm-x86_64/sparsemem.h with 100% similarity]
include/asm-x86/spinlock.h [new file with mode: 0644]
include/asm-x86/spinlock_32.h [moved from include/asm-i386/spinlock.h with 100% similarity]
include/asm-x86/spinlock_64.h [moved from include/asm-x86_64/spinlock.h with 100% similarity]
include/asm-x86/spinlock_types.h [moved from include/asm-i386/spinlock_types.h with 100% similarity]
include/asm-x86/srat.h [moved from include/asm-i386/srat.h with 100% similarity]
include/asm-x86/stacktrace.h [moved from include/asm-x86_64/stacktrace.h with 100% similarity]
include/asm-x86/stat.h [new file with mode: 0644]
include/asm-x86/stat_32.h [moved from include/asm-i386/stat.h with 100% similarity]
include/asm-x86/stat_64.h [moved from include/asm-x86_64/stat.h with 100% similarity]
include/asm-x86/statfs.h [new file with mode: 0644]
include/asm-x86/statfs_32.h [moved from include/asm-i386/statfs.h with 100% similarity]
include/asm-x86/statfs_64.h [moved from include/asm-x86_64/statfs.h with 100% similarity]
include/asm-x86/string.h [new file with mode: 0644]
include/asm-x86/string_32.h [moved from include/asm-i386/string.h with 100% similarity]
include/asm-x86/string_64.h [moved from include/asm-x86_64/string.h with 100% similarity]
include/asm-x86/suspend.h [new file with mode: 0644]
include/asm-x86/suspend_32.h [moved from include/asm-i386/suspend.h with 100% similarity]
include/asm-x86/suspend_64.h [moved from include/asm-x86_64/suspend.h with 100% similarity]
include/asm-x86/swiotlb.h [moved from include/asm-x86_64/swiotlb.h with 100% similarity]
include/asm-x86/sync_bitops.h [moved from include/asm-i386/sync_bitops.h with 100% similarity]
include/asm-x86/system.h [new file with mode: 0644]
include/asm-x86/system_32.h [moved from include/asm-i386/system.h with 100% similarity]
include/asm-x86/system_64.h [moved from include/asm-x86_64/system.h with 100% similarity]
include/asm-x86/tce.h [moved from include/asm-x86_64/tce.h with 100% similarity]
include/asm-x86/termbits.h [new file with mode: 0644]
include/asm-x86/termbits_32.h [moved from include/asm-i386/termbits.h with 100% similarity]
include/asm-x86/termbits_64.h [moved from include/asm-x86_64/termbits.h with 100% similarity]
include/asm-x86/termios.h [new file with mode: 0644]
include/asm-x86/termios_32.h [moved from include/asm-i386/termios.h with 100% similarity]
include/asm-x86/termios_64.h [moved from include/asm-x86_64/termios.h with 100% similarity]
include/asm-x86/therm_throt.h [moved from include/asm-i386/therm_throt.h with 100% similarity]
include/asm-x86/thread_info.h [new file with mode: 0644]
include/asm-x86/thread_info_32.h [moved from include/asm-i386/thread_info.h with 100% similarity]
include/asm-x86/thread_info_64.h [moved from include/asm-x86_64/thread_info.h with 100% similarity]
include/asm-x86/time.h [moved from include/asm-i386/time.h with 100% similarity]
include/asm-x86/timer.h [moved from include/asm-i386/timer.h with 100% similarity]
include/asm-x86/timex.h [new file with mode: 0644]
include/asm-x86/timex_32.h [moved from include/asm-i386/timex.h with 100% similarity]
include/asm-x86/timex_64.h [moved from include/asm-x86_64/timex.h with 100% similarity]
include/asm-x86/tlb.h [new file with mode: 0644]
include/asm-x86/tlb_32.h [moved from include/asm-i386/tlb.h with 100% similarity]
include/asm-x86/tlb_64.h [moved from include/asm-x86_64/tlb.h with 100% similarity]
include/asm-x86/tlbflush.h [new file with mode: 0644]
include/asm-x86/tlbflush_32.h [moved from include/asm-i386/tlbflush.h with 100% similarity]
include/asm-x86/tlbflush_64.h [moved from include/asm-x86_64/tlbflush.h with 100% similarity]
include/asm-x86/topology.h [new file with mode: 0644]
include/asm-x86/topology_32.h [moved from include/asm-i386/topology.h with 100% similarity]
include/asm-x86/topology_64.h [moved from include/asm-x86_64/topology.h with 100% similarity]
include/asm-x86/tsc.h [moved from include/asm-i386/tsc.h with 100% similarity]
include/asm-x86/types.h [new file with mode: 0644]
include/asm-x86/types_32.h [moved from include/asm-i386/types.h with 100% similarity]
include/asm-x86/types_64.h [moved from include/asm-x86_64/types.h with 100% similarity]
include/asm-x86/uaccess.h [new file with mode: 0644]
include/asm-x86/uaccess_32.h [moved from include/asm-i386/uaccess.h with 100% similarity]
include/asm-x86/uaccess_64.h [moved from include/asm-x86_64/uaccess.h with 100% similarity]
include/asm-x86/ucontext.h [new file with mode: 0644]
include/asm-x86/ucontext_32.h [moved from include/asm-i386/ucontext.h with 100% similarity]
include/asm-x86/ucontext_64.h [moved from include/asm-x86_64/ucontext.h with 100% similarity]
include/asm-x86/unaligned.h [new file with mode: 0644]
include/asm-x86/unaligned_32.h [moved from include/asm-i386/unaligned.h with 100% similarity]
include/asm-x86/unaligned_64.h [moved from include/asm-x86_64/unaligned.h with 100% similarity]
include/asm-x86/unistd.h [new file with mode: 0644]
include/asm-x86/unistd_32.h [moved from include/asm-i386/unistd.h with 100% similarity]
include/asm-x86/unistd_64.h [moved from include/asm-x86_64/unistd.h with 100% similarity]
include/asm-x86/unwind.h [new file with mode: 0644]
include/asm-x86/unwind_32.h [moved from include/asm-i386/unwind.h with 100% similarity]
include/asm-x86/unwind_64.h [moved from include/asm-x86_64/unwind.h with 100% similarity]
include/asm-x86/user.h [new file with mode: 0644]
include/asm-x86/user32.h [moved from include/asm-x86_64/user32.h with 100% similarity]
include/asm-x86/user_32.h [moved from include/asm-i386/user.h with 100% similarity]
include/asm-x86/user_64.h [moved from include/asm-x86_64/user.h with 100% similarity]
include/asm-x86/vga.h [moved from include/asm-i386/vga.h with 100% similarity]
include/asm-x86/vgtod.h [moved from include/asm-x86_64/vgtod.h with 100% similarity]
include/asm-x86/vic.h [moved from include/asm-i386/vic.h with 100% similarity]
include/asm-x86/vm86.h [moved from include/asm-i386/vm86.h with 100% similarity]
include/asm-x86/vmi.h [moved from include/asm-i386/vmi.h with 100% similarity]
include/asm-x86/vmi_time.h [moved from include/asm-i386/vmi_time.h with 100% similarity]
include/asm-x86/voyager.h [moved from include/asm-i386/voyager.h with 100% similarity]
include/asm-x86/vsyscall.h [moved from include/asm-x86_64/vsyscall.h with 100% similarity]
include/asm-x86/vsyscall32.h [moved from include/asm-x86_64/vsyscall32.h with 100% similarity]
include/asm-x86/xen/hypercall.h [moved from include/asm-i386/xen/hypercall.h with 100% similarity]
include/asm-x86/xen/hypervisor.h [moved from include/asm-i386/xen/hypervisor.h with 100% similarity]
include/asm-x86/xen/interface.h [moved from include/asm-i386/xen/interface.h with 100% similarity]
include/asm-x86/xor.h [new file with mode: 0644]
include/asm-x86/xor_32.h [moved from include/asm-i386/xor.h with 100% similarity]
include/asm-x86/xor_64.h [moved from include/asm-x86_64/xor.h with 100% similarity]
include/asm-x86_64/Kbuild [deleted file]
include/asm-x86_64/boot.h [deleted file]
include/asm-x86_64/bootparam.h [deleted file]
include/asm-x86_64/cpu.h [deleted file]
include/asm-x86_64/cpufeature.h [deleted file]
include/asm-x86_64/emergency-restart.h [deleted file]
include/asm-x86_64/fcntl.h [deleted file]
include/asm-x86_64/hpet.h [deleted file]
include/asm-x86_64/hypertransport.h [deleted file]
include/asm-x86_64/ide.h [deleted file]
include/asm-x86_64/ioctl.h [deleted file]
include/asm-x86_64/ist.h [deleted file]
include/asm-x86_64/msidef.h [deleted file]
include/asm-x86_64/msr-index.h [deleted file]
include/asm-x86_64/poll.h [deleted file]
include/asm-x86_64/processor-flags.h [deleted file]
include/asm-x86_64/socket.h [deleted file]
include/asm-x86_64/spinlock_types.h [deleted file]
include/asm-x86_64/therm_throt.h [deleted file]
include/asm-x86_64/tsc.h [deleted file]
include/asm-x86_64/vga.h [deleted file]
scripts/checksyscalls.sh

index 73c5f1f..103e346 100644 (file)
@@ -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 2d403cf..1570d24 100644 (file)
--- 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)
index f2067e3..2a30f5f 100644 (file)
--- 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
index 9c1da72..b433dae 100644 (file)
@@ -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
 
index 8850fe4..5e901c7 100644 (file)
@@ -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>
index 5133988..71b2ae4 100644 (file)
@@ -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>
 };
index 8850fe4..91b7b59 100644 (file)
@@ -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>
index 369151d..2e1869e 100644 (file)
@@ -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,
index c9014ca..49e20c2 100644 (file)
@@ -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"
 
 
index 63d592c..9d498c2 100644 (file)
@@ -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 (file)
index cbf6e8f..0000000
+++ /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 (file)
index dfd88a6..0000000
+++ /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 (file)
index 4f6738b..0000000
+++ /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 (file)
index 7d1f6a5..0000000
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-x86_64/stacktrace.h>
index 0ec78f6..e245f2a 100644 (file)
@@ -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 (file)
index 0000000..d3c2b38
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "8253pit_32.h"
+#else
+# include "8253pit_64.h"
+#endif
diff --git a/include/asm-x86/Kbuild b/include/asm-x86/Kbuild
new file mode 100644 (file)
index 0000000..c5e43cb
--- /dev/null
@@ -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 (file)
index 0000000..5bc9b1d
--- /dev/null
@@ -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-x86/acpi.h b/include/asm-x86/acpi.h
new file mode 100644 (file)
index 0000000..0693689
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "acpi_32.h"
+#else
+# include "acpi_64.h"
+#endif
diff --git a/include/asm-x86/agp.h b/include/asm-x86/agp.h
new file mode 100644 (file)
index 0000000..9348f1e
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "agp_32.h"
+#else
+# include "agp_64.h"
+#endif
diff --git a/include/asm-x86/alternative-asm.i b/include/asm-x86/alternative-asm.i
new file mode 100644 (file)
index 0000000..4f360cd
--- /dev/null
@@ -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-x86/alternative.h b/include/asm-x86/alternative.h
new file mode 100644 (file)
index 0000000..9eef6a3
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "alternative_32.h"
+#else
+# include "alternative_64.h"
+#endif
diff --git a/include/asm-x86/apic.h b/include/asm-x86/apic.h
new file mode 100644 (file)
index 0000000..9fbcc0b
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "apic_32.h"
+#else
+# include "apic_64.h"
+#endif
diff --git a/include/asm-x86/apicdef.h b/include/asm-x86/apicdef.h
new file mode 100644 (file)
index 0000000..4542c22
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "apicdef_32.h"
+#else
+# include "apicdef_64.h"
+#endif
diff --git a/include/asm-x86/atomic.h b/include/asm-x86/atomic.h
new file mode 100644 (file)
index 0000000..4e1b887
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "atomic_32.h"
+#else
+# include "atomic_64.h"
+#endif
diff --git a/include/asm-x86/auxvec.h b/include/asm-x86/auxvec.h
new file mode 100644 (file)
index 0000000..7ff866f
--- /dev/null
@@ -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-x86/bitops.h b/include/asm-x86/bitops.h
new file mode 100644 (file)
index 0000000..07e3f6d
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "bitops_32.h"
+#else
+# include "bitops_64.h"
+#endif
diff --git a/include/asm-x86/bug.h b/include/asm-x86/bug.h
new file mode 100644 (file)
index 0000000..c655d7f
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "bug_32.h"
+#else
+# include "bug_64.h"
+#endif
diff --git a/include/asm-x86/bugs.h b/include/asm-x86/bugs.h
new file mode 100644 (file)
index 0000000..ddf42d3
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "bugs_32.h"
+#else
+# include "bugs_64.h"
+#endif
diff --git a/include/asm-x86/byteorder.h b/include/asm-x86/byteorder.h
new file mode 100644 (file)
index 0000000..eb14b18
--- /dev/null
@@ -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-x86/cache.h b/include/asm-x86/cache.h
new file mode 100644 (file)
index 0000000..c36d190
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "cache_32.h"
+#else
+# include "cache_64.h"
+#endif
diff --git a/include/asm-x86/cacheflush.h b/include/asm-x86/cacheflush.h
new file mode 100644 (file)
index 0000000..e2df3b5
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "cacheflush_32.h"
+#else
+# include "cacheflush_64.h"
+#endif
diff --git a/include/asm-x86/checksum.h b/include/asm-x86/checksum.h
new file mode 100644 (file)
index 0000000..848850f
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "checksum_32.h"
+#else
+# include "checksum_64.h"
+#endif
diff --git a/include/asm-x86/cmpxchg.h b/include/asm-x86/cmpxchg.h
new file mode 100644 (file)
index 0000000..a460fa0
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "cmpxchg_32.h"
+#else
+# include "cmpxchg_64.h"
+#endif
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 (file)
index 0000000..b7160a4
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "cpufeature_32.h"
+#else
+# include "cpufeature_64.h"
+#endif
diff --git a/include/asm-x86/cpufeature_64.h b/include/asm-x86/cpufeature_64.h
new file mode 100644 (file)
index 0000000..2983501
--- /dev/null
@@ -0,0 +1,30 @@
+/*
+ * cpufeature_32.h
+ *
+ * Defines x86 CPU feature bits
+ */
+
+#ifndef __ASM_X8664_CPUFEATURE_H
+#define __ASM_X8664_CPUFEATURE_H
+
+#include <asm/cpufeature_32.h>
+
+#undef  cpu_has_vme
+#define cpu_has_vme            0
+
+#undef  cpu_has_pae
+#define cpu_has_pae            ___BUG___
+
+#undef  cpu_has_mp
+#define cpu_has_mp             1 /* XXX */
+
+#undef  cpu_has_k6_mtrr
+#define cpu_has_k6_mtrr        0
+
+#undef  cpu_has_cyrix_arr
+#define cpu_has_cyrix_arr      0
+
+#undef  cpu_has_centaur_mcr
+#define cpu_has_centaur_mcr    0
+
+#endif /* __ASM_X8664_CPUFEATURE_H */
diff --git a/include/asm-x86/cputime.h b/include/asm-x86/cputime.h
new file mode 100644 (file)
index 0000000..87c37cf
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "cputime_32.h"
+#else
+# include "cputime_64.h"
+#endif
diff --git a/include/asm-x86/current.h b/include/asm-x86/current.h
new file mode 100644 (file)
index 0000000..d2526d3
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "current_32.h"
+#else
+# include "current_64.h"
+#endif
diff --git a/include/asm-x86/debugreg.h b/include/asm-x86/debugreg.h
new file mode 100644 (file)
index 0000000..b6ce7e4
--- /dev/null
@@ -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-x86/delay.h b/include/asm-x86/delay.h
new file mode 100644 (file)
index 0000000..10f2c71
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "delay_32.h"
+#else
+# include "delay_64.h"
+#endif
diff --git a/include/asm-x86/desc.h b/include/asm-x86/desc.h
new file mode 100644 (file)
index 0000000..6065c50
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "desc_32.h"
+#else
+# include "desc_64.h"
+#endif
diff --git a/include/asm-x86/device.h b/include/asm-x86/device.h
new file mode 100644 (file)
index 0000000..e2bcf7c
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "device_32.h"
+#else
+# include "device_64.h"
+#endif
diff --git a/include/asm-x86/div64.h b/include/asm-x86/div64.h
new file mode 100644 (file)
index 0000000..8ac7da6
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "div64_32.h"
+#else
+# include "div64_64.h"
+#endif
diff --git a/include/asm-x86/dma-mapping.h b/include/asm-x86/dma-mapping.h
new file mode 100644 (file)
index 0000000..58f790f
--- /dev/null
@@ -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-x86/dma.h b/include/asm-x86/dma.h
new file mode 100644 (file)
index 0000000..9f936c6
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "dma_32.h"
+#else
+# include "dma_64.h"
+#endif
diff --git a/include/asm-x86/dmi.h b/include/asm-x86/dmi.h
new file mode 100644 (file)
index 0000000..c9e4e8e
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "dmi_32.h"
+#else
+# include "dmi_64.h"
+#endif
diff --git a/include/asm-x86/dwarf2.h b/include/asm-x86/dwarf2.h
new file mode 100644 (file)
index 0000000..b3cbb0c
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "dwarf2_32.h"
+#else
+# include "dwarf2_64.h"
+#endif
diff --git a/include/asm-x86/e820.h b/include/asm-x86/e820.h
new file mode 100644 (file)
index 0000000..5d4d218
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "e820_32.h"
+#else
+# include "e820_64.h"
+#endif
diff --git a/include/asm-x86/edac.h b/include/asm-x86/edac.h
new file mode 100644 (file)
index 0000000..f8b888e
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "edac_32.h"
+#else
+# include "edac_64.h"
+#endif
diff --git a/include/asm-x86/elf.h b/include/asm-x86/elf.h
new file mode 100644 (file)
index 0000000..ed6bb6e
--- /dev/null
@@ -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-x86/errno.h b/include/asm-x86/errno.h
new file mode 100644 (file)
index 0000000..9d511be
--- /dev/null
@@ -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-x86/fb.h b/include/asm-x86/fb.h
new file mode 100644 (file)
index 0000000..238c7ca
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "fb_32.h"
+#else
+# include "fb_64.h"
+#endif
diff --git a/include/asm-x86/fixmap.h b/include/asm-x86/fixmap.h
new file mode 100644 (file)
index 0000000..382eb27
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "fixmap_32.h"
+#else
+# include "fixmap_64.h"
+#endif
diff --git a/include/asm-x86/floppy.h b/include/asm-x86/floppy.h
new file mode 100644 (file)
index 0000000..aecbb6d
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "floppy_32.h"
+#else
+# include "floppy_64.h"
+#endif
diff --git a/include/asm-x86/futex.h b/include/asm-x86/futex.h
new file mode 100644 (file)
index 0000000..1f4610e
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "futex_32.h"
+#else
+# include "futex_64.h"
+#endif
diff --git a/include/asm-x86/genapic.h b/include/asm-x86/genapic.h
new file mode 100644 (file)
index 0000000..d48bee6
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "genapic_32.h"
+#else
+# include "genapic_64.h"
+#endif
diff --git a/include/asm-x86/hardirq.h b/include/asm-x86/hardirq.h
new file mode 100644 (file)
index 0000000..314434d
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "hardirq_32.h"
+#else
+# include "hardirq_64.h"
+#endif
diff --git a/include/asm-x86/hpet.h b/include/asm-x86/hpet.h
new file mode 100644 (file)
index 0000000..9eff486
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "hpet_32.h"
+#else
+# include "hpet_64.h"
+#endif
diff --git a/include/asm-x86/hpet_64.h b/include/asm-x86/hpet_64.h
new file mode 100644 (file)
index 0000000..fd4deca
--- /dev/null
@@ -0,0 +1,18 @@
+#ifndef _ASM_X8664_HPET_H
+#define _ASM_X8664_HPET_H 1
+
+#include <asm/hpet_32.h>
+
+#define HPET_TICK_RATE (HZ * 100000UL)
+
+extern int hpet_rtc_timer_init(void);
+extern int hpet_arch_init(void);
+extern int hpet_timer_stop_set_go(unsigned long tick);
+extern int hpet_reenable(void);
+extern unsigned int hpet_calibrate_tsc(void);
+
+extern int hpet_use_timer;
+extern unsigned long hpet_period;
+extern unsigned long hpet_tick;
+
+#endif
diff --git a/include/asm-x86/hw_irq.h b/include/asm-x86/hw_irq.h
new file mode 100644 (file)
index 0000000..bf02539
--- /dev/null
@@ -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-x86/i387.h b/include/asm-x86/i387.h
new file mode 100644 (file)
index 0000000..a8bbed3
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "i387_32.h"
+#else
+# include "i387_64.h"
+#endif
diff --git a/include/asm-x86/i8253.h b/include/asm-x86/i8253.h
new file mode 100644 (file)
index 0000000..b2a4f99
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "i8253_32.h"
+#else
+# include "i8253_64.h"
+#endif
similarity index 100%
rename from include/asm-i386/ide.h
rename to include/asm-x86/ide.h
diff --git a/include/asm-x86/intel_arch_perfmon.h b/include/asm-x86/intel_arch_perfmon.h
new file mode 100644 (file)
index 0000000..4f6d4e6
--- /dev/null
@@ -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-x86/io.h b/include/asm-x86/io.h
new file mode 100644 (file)
index 0000000..5a58b17
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "io_32.h"
+#else
+# include "io_64.h"
+#endif
diff --git a/include/asm-x86/io_apic.h b/include/asm-x86/io_apic.h
new file mode 100644 (file)
index 0000000..8849496
--- /dev/null
@@ -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-x86/ioctls.h b/include/asm-x86/ioctls.h
new file mode 100644 (file)
index 0000000..1e0fd48
--- /dev/null
@@ -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
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 (file)
index 0000000..eb2e448
--- /dev/null
@@ -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-x86/irq.h b/include/asm-x86/irq.h
new file mode 100644 (file)
index 0000000..7ba9054
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "irq_32.h"
+#else
+# include "irq_64.h"
+#endif
diff --git a/include/asm-x86/irq_regs.h b/include/asm-x86/irq_regs.h
new file mode 100644 (file)
index 0000000..89c898a
--- /dev/null
@@ -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-x86/irqflags.h b/include/asm-x86/irqflags.h
new file mode 100644 (file)
index 0000000..1b695ff
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "irqflags_32.h"
+#else
+# include "irqflags_64.h"
+#endif
similarity index 100%
rename from include/asm-i386/ist.h
rename to include/asm-x86/ist.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 (file)
index 0000000..3847910
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "kdebug_32.h"
+#else
+# include "kdebug_64.h"
+#endif
diff --git a/include/asm-x86/kexec.h b/include/asm-x86/kexec.h
new file mode 100644 (file)
index 0000000..718ddbf
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "kexec_32.h"
+#else
+# include "kexec_64.h"
+#endif
diff --git a/include/asm-x86/kmap_types.h b/include/asm-x86/kmap_types.h
new file mode 100644 (file)
index 0000000..e4ec724
--- /dev/null
@@ -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-x86/kprobes.h b/include/asm-x86/kprobes.h
new file mode 100644 (file)
index 0000000..b7bbd25
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "kprobes_32.h"
+#else
+# include "kprobes_64.h"
+#endif
diff --git a/include/asm-x86/ldt.h b/include/asm-x86/ldt.h
new file mode 100644 (file)
index 0000000..3d9cc20
--- /dev/null
@@ -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-x86/linkage.h b/include/asm-x86/linkage.h
new file mode 100644 (file)
index 0000000..94b257f
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "linkage_32.h"
+#else
+# include "linkage_64.h"
+#endif
diff --git a/include/asm-x86/local.h b/include/asm-x86/local.h
new file mode 100644 (file)
index 0000000..c7a1b1c
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "local_32.h"
+#else
+# include "local_64.h"
+#endif
diff --git a/include/asm-x86/mc146818rtc.h b/include/asm-x86/mc146818rtc.h
new file mode 100644 (file)
index 0000000..5c2bb66
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "mc146818rtc_32.h"
+#else
+# include "mc146818rtc_64.h"
+#endif
similarity index 100%
rename from include/asm-i386/mca.h
rename to include/asm-x86/mca.h
diff --git a/include/asm-x86/mce.h b/include/asm-x86/mce.h
new file mode 100644 (file)
index 0000000..cc8ca38
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "mce_32.h"
+#else
+# include "mce_64.h"
+#endif
diff --git a/include/asm-x86/mman.h b/include/asm-x86/mman.h
new file mode 100644 (file)
index 0000000..322db07
--- /dev/null
@@ -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-x86/mmu.h b/include/asm-x86/mmu.h
new file mode 100644 (file)
index 0000000..9c628cd
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "mmu_32.h"
+#else
+# include "mmu_64.h"
+#endif
diff --git a/include/asm-x86/mmu_context.h b/include/asm-x86/mmu_context.h
new file mode 100644 (file)
index 0000000..6598450
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "mmu_context_32.h"
+#else
+# include "mmu_context_64.h"
+#endif
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 (file)
index 0000000..64217ea
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "mmzone_32.h"
+#else
+# include "mmzone_64.h"
+#endif
diff --git a/include/asm-x86/module.h b/include/asm-x86/module.h
new file mode 100644 (file)
index 0000000..2b2f18d
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "module_32.h"
+#else
+# include "module_64.h"
+#endif
diff --git a/include/asm-x86/mpspec.h b/include/asm-x86/mpspec.h
new file mode 100644 (file)
index 0000000..8f268e8
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "mpspec_32.h"
+#else
+# include "mpspec_64.h"
+#endif
diff --git a/include/asm-x86/msgbuf.h b/include/asm-x86/msgbuf.h
new file mode 100644 (file)
index 0000000..154f7d6
--- /dev/null
@@ -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-x86/msr.h b/include/asm-x86/msr.h
new file mode 100644 (file)
index 0000000..2f87ce0
--- /dev/null
@@ -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-x86/mtrr.h b/include/asm-x86/mtrr.h
new file mode 100644 (file)
index 0000000..34f633b
--- /dev/null
@@ -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-x86/mutex.h b/include/asm-x86/mutex.h
new file mode 100644 (file)
index 0000000..a731b9c
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "mutex_32.h"
+#else
+# include "mutex_64.h"
+#endif
diff --git a/include/asm-x86/namei.h b/include/asm-x86/namei.h
new file mode 100644 (file)
index 0000000..732f8f0
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "namei_32.h"
+#else
+# include "namei_64.h"
+#endif
diff --git a/include/asm-x86/nmi.h b/include/asm-x86/nmi.h
new file mode 100644 (file)
index 0000000..53ccac1
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "nmi_32.h"
+#else
+# include "nmi_64.h"
+#endif
diff --git a/include/asm-x86/numa.h b/include/asm-x86/numa.h
new file mode 100644 (file)
index 0000000..27da400
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "numa_32.h"
+#else
+# include "numa_64.h"
+#endif
diff --git a/include/asm-x86/page.h b/include/asm-x86/page.h
new file mode 100644 (file)
index 0000000..a757eb2
--- /dev/null
@@ -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-x86/param.h b/include/asm-x86/param.h
new file mode 100644 (file)
index 0000000..640851b
--- /dev/null
@@ -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-x86/parport.h b/include/asm-x86/parport.h
new file mode 100644 (file)
index 0000000..2a31157
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "parport_32.h"
+#else
+# include "parport_64.h"
+#endif
diff --git a/include/asm-x86/pci.h b/include/asm-x86/pci.h
new file mode 100644 (file)
index 0000000..a8cac8c
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "pci_32.h"
+#else
+# include "pci_64.h"
+#endif
diff --git a/include/asm-x86/percpu.h b/include/asm-x86/percpu.h
new file mode 100644 (file)
index 0000000..a1aaad2
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "percpu_32.h"
+#else
+# include "percpu_64.h"
+#endif
diff --git a/include/asm-x86/pgalloc.h b/include/asm-x86/pgalloc.h
new file mode 100644 (file)
index 0000000..5886eed
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "pgalloc_32.h"
+#else
+# include "pgalloc_64.h"
+#endif
diff --git a/include/asm-x86/pgtable.h b/include/asm-x86/pgtable.h
new file mode 100644 (file)
index 0000000..1039140
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "pgtable_32.h"
+#else
+# include "pgtable_64.h"
+#endif
diff --git a/include/asm-x86/posix_types.h b/include/asm-x86/posix_types.h
new file mode 100644 (file)
index 0000000..bb7133d
--- /dev/null
@@ -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-x86/processor.h b/include/asm-x86/processor.h
new file mode 100644 (file)
index 0000000..46e1c04
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "processor_32.h"
+#else
+# include "processor_64.h"
+#endif
diff --git a/include/asm-x86/ptrace-abi.h b/include/asm-x86/ptrace-abi.h
new file mode 100644 (file)
index 0000000..6824c49
--- /dev/null
@@ -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-x86/ptrace.h b/include/asm-x86/ptrace.h
new file mode 100644 (file)
index 0000000..bc4d64a
--- /dev/null
@@ -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-x86/required-features.h b/include/asm-x86/required-features.h
new file mode 100644 (file)
index 0000000..8b64f3e
--- /dev/null
@@ -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-x86/resource.h b/include/asm-x86/resource.h
new file mode 100644 (file)
index 0000000..732410a
--- /dev/null
@@ -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-x86/resume-trace.h b/include/asm-x86/resume-trace.h
new file mode 100644 (file)
index 0000000..9b6dd09
--- /dev/null
@@ -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-x86/rtc.h b/include/asm-x86/rtc.h
new file mode 100644 (file)
index 0000000..1f0c98e
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "rtc_32.h"
+#else
+# include "rtc_64.h"
+#endif
diff --git a/include/asm-x86/rwlock.h b/include/asm-x86/rwlock.h
new file mode 100644 (file)
index 0000000..a3be7d8
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "rwlock_32.h"
+#else
+# include "rwlock_64.h"
+#endif
diff --git a/include/asm-x86/scatterlist.h b/include/asm-x86/scatterlist.h
new file mode 100644 (file)
index 0000000..3a1e762
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "scatterlist_32.h"
+#else
+# include "scatterlist_64.h"
+#endif
diff --git a/include/asm-x86/seccomp.h b/include/asm-x86/seccomp.h
new file mode 100644 (file)
index 0000000..c62e58a
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "seccomp_32.h"
+#else
+# include "seccomp_64.h"
+#endif
diff --git a/include/asm-x86/sections.h b/include/asm-x86/sections.h
new file mode 100644 (file)
index 0000000..ae6c69d
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "sections_32.h"
+#else
+# include "sections_64.h"
+#endif
diff --git a/include/asm-x86/segment.h b/include/asm-x86/segment.h
new file mode 100644 (file)
index 0000000..6050682
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "segment_32.h"
+#else
+# include "segment_64.h"
+#endif
diff --git a/include/asm-x86/semaphore.h b/include/asm-x86/semaphore.h
new file mode 100644 (file)
index 0000000..572c0b6
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "semaphore_32.h"
+#else
+# include "semaphore_64.h"
+#endif
diff --git a/include/asm-x86/sembuf.h b/include/asm-x86/sembuf.h
new file mode 100644 (file)
index 0000000..e42c971
--- /dev/null
@@ -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-x86/serial.h b/include/asm-x86/serial.h
new file mode 100644 (file)
index 0000000..cf1b052
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "serial_32.h"
+#else
+# include "serial_64.h"
+#endif
diff --git a/include/asm-x86/setup.h b/include/asm-x86/setup.h
new file mode 100644 (file)
index 0000000..81c0d98
--- /dev/null
@@ -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-x86/shmbuf.h b/include/asm-x86/shmbuf.h
new file mode 100644 (file)
index 0000000..e85f1cb
--- /dev/null
@@ -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-x86/shmparam.h b/include/asm-x86/shmparam.h
new file mode 100644 (file)
index 0000000..165627c
--- /dev/null
@@ -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-x86/sigcontext.h b/include/asm-x86/sigcontext.h
new file mode 100644 (file)
index 0000000..0d16cef
--- /dev/null
@@ -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/siginfo.h b/include/asm-x86/siginfo.h
new file mode 100644 (file)
index 0000000..0b8e4bb
--- /dev/null
@@ -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-x86/signal.h b/include/asm-x86/signal.h
new file mode 100644 (file)
index 0000000..bf5a63f
--- /dev/null
@@ -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-x86/smp.h b/include/asm-x86/smp.h
new file mode 100644 (file)
index 0000000..f2e8319
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "smp_32.h"
+#else
+# include "smp_64.h"
+#endif
diff --git a/include/asm-x86/sockios.h b/include/asm-x86/sockios.h
new file mode 100644 (file)
index 0000000..5a134fc
--- /dev/null
@@ -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-x86/sparsemem.h b/include/asm-x86/sparsemem.h
new file mode 100644 (file)
index 0000000..3f203b1
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "sparsemem_32.h"
+#else
+# include "sparsemem_64.h"
+#endif
diff --git a/include/asm-x86/spinlock.h b/include/asm-x86/spinlock.h
new file mode 100644 (file)
index 0000000..d74d85e
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "spinlock_32.h"
+#else
+# include "spinlock_64.h"
+#endif
diff --git a/include/asm-x86/stat.h b/include/asm-x86/stat.h
new file mode 100644 (file)
index 0000000..3ff6b50
--- /dev/null
@@ -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-x86/statfs.h b/include/asm-x86/statfs.h
new file mode 100644 (file)
index 0000000..327fb5d
--- /dev/null
@@ -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-x86/string.h b/include/asm-x86/string.h
new file mode 100644 (file)
index 0000000..6dfd6d9
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "string_32.h"
+#else
+# include "string_64.h"
+#endif
diff --git a/include/asm-x86/suspend.h b/include/asm-x86/suspend.h
new file mode 100644 (file)
index 0000000..9bd521f
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "suspend_32.h"
+#else
+# include "suspend_64.h"
+#endif
diff --git a/include/asm-x86/system.h b/include/asm-x86/system.h
new file mode 100644 (file)
index 0000000..692562b
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "system_32.h"
+#else
+# include "system_64.h"
+#endif
diff --git a/include/asm-x86/termbits.h b/include/asm-x86/termbits.h
new file mode 100644 (file)
index 0000000..69f3080
--- /dev/null
@@ -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-x86/termios.h b/include/asm-x86/termios.h
new file mode 100644 (file)
index 0000000..a4f4ae2
--- /dev/null
@@ -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-x86/thread_info.h b/include/asm-x86/thread_info.h
new file mode 100644 (file)
index 0000000..d5fd12f
--- /dev/null
@@ -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-x86/timex.h b/include/asm-x86/timex.h
new file mode 100644 (file)
index 0000000..d01c18c
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "timex_32.h"
+#else
+# include "timex_64.h"
+#endif
diff --git a/include/asm-x86/tlb.h b/include/asm-x86/tlb.h
new file mode 100644 (file)
index 0000000..7d55c37
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "tlb_32.h"
+#else
+# include "tlb_64.h"
+#endif
diff --git a/include/asm-x86/tlbflush.h b/include/asm-x86/tlbflush.h
new file mode 100644 (file)
index 0000000..9af4cc8
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "tlbflush_32.h"
+#else
+# include "tlbflush_64.h"
+#endif
diff --git a/include/asm-x86/topology.h b/include/asm-x86/topology.h
new file mode 100644 (file)
index 0000000..b10fde9
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "topology_32.h"
+#else
+# include "topology_64.h"
+#endif
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 (file)
index 0000000..a777a9b
--- /dev/null
@@ -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-x86/uaccess.h b/include/asm-x86/uaccess.h
new file mode 100644 (file)
index 0000000..9fefd29
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "uaccess_32.h"
+#else
+# include "uaccess_64.h"
+#endif
diff --git a/include/asm-x86/ucontext.h b/include/asm-x86/ucontext.h
new file mode 100644 (file)
index 0000000..175c8cb
--- /dev/null
@@ -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-x86/unaligned.h b/include/asm-x86/unaligned.h
new file mode 100644 (file)
index 0000000..6806715
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "unaligned_32.h"
+#else
+# include "unaligned_64.h"
+#endif
diff --git a/include/asm-x86/unistd.h b/include/asm-x86/unistd.h
new file mode 100644 (file)
index 0000000..2a58ed3
--- /dev/null
@@ -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-x86/unwind.h b/include/asm-x86/unwind.h
new file mode 100644 (file)
index 0000000..7e4d7ad
--- /dev/null
@@ -0,0 +1,5 @@
+#ifdef CONFIG_X86_32
+# include "unwind_32.h"
+#else
+# include "unwind_64.h"
+#endif
similarity index 100%
rename from