Merge branch 'x86/um-header' of git://git.kernel.org/pub/scm/linux/kernel/git/tip...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 23 Oct 2008 17:22:01 +0000 (10:22 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 23 Oct 2008 17:22:01 +0000 (10:22 -0700)
* 'x86/um-header' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: (26 commits)
  x86: canonicalize remaining header guards
  x86: drop double underscores from header guards
  x86: Fix ASM_X86__ header guards
  x86, um: get rid of uml-config.h
  x86, um: get rid of arch/um/Kconfig.arch
  x86, um: get rid of arch/um/os symlink
  x86, um: get rid of excessive includes of uml-config.h
  x86, um: get rid of header symlinks
  x86, um: merge Kconfig.i386 and Kconfig.x86_64
  x86, um: get rid of sysdep symlink
  x86, um: trim the junk from uml ptrace-*.h
  x86, um: take vm-flags.h to sysdep
  x86, um: get rid of uml asm/arch
  x86, um: get rid of uml highmem.h
  x86, um: get rid of uml unistd.h
  x86, um: get rid of system.h -> system.h include
  x86, um: uml atomic.h is not needed anymore
  x86, um: untangle uml ldt.h
  x86, um: get rid of more uml asm/arch uses
  x86, um: remove dead header (uml module-generic.h; never used these days)
  ...

593 files changed:
Makefile
arch/ia64/ia32/audit.c
arch/powerpc/include/asm/signal.h
arch/powerpc/kernel/signal.h
arch/um/Kconfig.common [new file with mode: 0644]
arch/um/Kconfig.rest [new file with mode: 0644]
arch/um/Kconfig.um [moved from arch/um/Kconfig with 77% similarity]
arch/um/Kconfig.x86 [moved from arch/um/Kconfig.i386 with 59% similarity]
arch/um/Kconfig.x86_64 [deleted file]
arch/um/Makefile
arch/um/Makefile-os-Linux
arch/um/drivers/Makefile
arch/um/include/asm/a.out-core.h [moved from include/asm-um/a.out-core.h with 100% similarity]
arch/um/include/asm/apic.h [moved from include/asm-um/apic.h with 100% similarity]
arch/um/include/asm/auxvec.h [moved from include/asm-um/auxvec.h with 100% similarity]
arch/um/include/asm/bugs.h [moved from include/asm-um/bugs.h with 100% similarity]
arch/um/include/asm/cache.h [moved from include/asm-um/cache.h with 100% similarity]
arch/um/include/asm/checksum.h [moved from include/asm-um/checksum.h with 100% similarity]
arch/um/include/asm/common.lds.S [moved from include/asm-um/common.lds.S with 100% similarity]
arch/um/include/asm/cputime.h [moved from include/asm-um/cputime.h with 100% similarity]
arch/um/include/asm/current.h [moved from include/asm-um/current.h with 100% similarity]
arch/um/include/asm/delay.h [moved from include/asm-um/delay.h with 100% similarity]
arch/um/include/asm/desc.h [moved from include/asm-um/desc.h with 100% similarity]
arch/um/include/asm/device.h [moved from include/asm-um/device.h with 100% similarity]
arch/um/include/asm/dma-mapping.h [moved from include/asm-um/dma-mapping.h with 100% similarity]
arch/um/include/asm/dma.h [moved from include/asm-um/dma.h with 100% similarity]
arch/um/include/asm/emergency-restart.h [moved from include/asm-um/emergency-restart.h with 100% similarity]
arch/um/include/asm/fixmap.h [moved from include/asm-um/fixmap.h with 99% similarity]
arch/um/include/asm/futex.h [moved from include/asm-um/futex.h with 100% similarity]
arch/um/include/asm/hardirq.h [moved from include/asm-um/hardirq.h with 100% similarity]
arch/um/include/asm/hw_irq.h [moved from include/asm-um/hw_irq.h with 100% similarity]
arch/um/include/asm/io.h [moved from include/asm-um/io.h with 100% similarity]
arch/um/include/asm/irq.h [moved from include/asm-um/irq.h with 100% similarity]
arch/um/include/asm/irq_regs.h [moved from include/asm-um/irq_regs.h with 100% similarity]
arch/um/include/asm/irq_vectors.h [moved from include/asm-um/irq_vectors.h with 100% similarity]
arch/um/include/asm/irqflags.h [moved from include/asm-um/irqflags.h with 100% similarity]
arch/um/include/asm/kdebug.h [moved from include/asm-um/kdebug.h with 100% similarity]
arch/um/include/asm/kmap_types.h [moved from include/asm-um/kmap_types.h with 100% similarity]
arch/um/include/asm/mmu.h [moved from include/asm-um/mmu.h with 100% similarity]
arch/um/include/asm/mmu_context.h [moved from include/asm-um/mmu_context.h with 100% similarity]
arch/um/include/asm/mutex.h [moved from include/asm-um/mutex.h with 100% similarity]
arch/um/include/asm/page.h [moved from include/asm-um/page.h with 99% similarity]
arch/um/include/asm/page_offset.h [moved from include/asm-um/page_offset.h with 100% similarity]
arch/um/include/asm/param.h [moved from include/asm-um/param.h with 100% similarity]
arch/um/include/asm/pci.h [moved from include/asm-um/pci.h with 100% similarity]
arch/um/include/asm/pda.h [moved from include/asm-um/pda.h with 100% similarity]
arch/um/include/asm/pgalloc.h [moved from include/asm-um/pgalloc.h with 100% similarity]
arch/um/include/asm/pgtable-2level.h [moved from include/asm-um/pgtable-2level.h with 100% similarity]
arch/um/include/asm/pgtable-3level.h [moved from include/asm-um/pgtable-3level.h with 100% similarity]
arch/um/include/asm/pgtable.h [moved from include/asm-um/pgtable.h with 97% similarity]
arch/um/include/asm/processor-generic.h [moved from include/asm-um/processor-generic.h with 100% similarity]
arch/um/include/asm/ptrace-generic.h [moved from include/asm-um/ptrace-generic.h with 97% similarity]
arch/um/include/asm/required-features.h [moved from include/asm-um/required-features.h with 100% similarity]
arch/um/include/asm/sections.h [moved from include/asm-um/sections.h with 100% similarity]
arch/um/include/asm/segment.h [moved from include/asm-um/segment.h with 100% similarity]
arch/um/include/asm/setup.h [moved from include/asm-um/setup.h with 100% similarity]
arch/um/include/asm/smp.h [moved from include/asm-um/smp.h with 100% similarity]
arch/um/include/asm/suspend.h [moved from include/asm-um/suspend.h with 100% similarity]
arch/um/include/asm/system.h [moved from include/asm-um/system-generic.h with 79% similarity]
arch/um/include/asm/thread_info.h [moved from include/asm-um/thread_info.h with 100% similarity]
arch/um/include/asm/timex.h [moved from include/asm-um/timex.h with 100% similarity]
arch/um/include/asm/tlb.h [moved from include/asm-um/tlb.h with 100% similarity]
arch/um/include/asm/tlbflush.h [moved from include/asm-um/tlbflush.h with 100% similarity]
arch/um/include/asm/topology.h [moved from include/asm-um/topology.h with 100% similarity]
arch/um/include/asm/uaccess.h [moved from include/asm-um/uaccess.h with 100% similarity]
arch/um/include/asm/xor.h [moved from include/asm-um/xor.h with 100% similarity]
arch/um/include/shared/aio.h [moved from arch/um/include/aio.h with 100% similarity]
arch/um/include/shared/arch.h [moved from arch/um/include/arch.h with 100% similarity]
arch/um/include/shared/as-layout.h [moved from arch/um/include/as-layout.h with 98% similarity]
arch/um/include/shared/chan_kern.h [moved from arch/um/include/chan_kern.h with 100% similarity]
arch/um/include/shared/chan_user.h [moved from arch/um/include/chan_user.h with 100% similarity]
arch/um/include/shared/common-offsets.h [moved from arch/um/include/common-offsets.h with 80% similarity]
arch/um/include/shared/elf_user.h [moved from arch/um/include/elf_user.h with 100% similarity]
arch/um/include/shared/frame_kern.h [moved from arch/um/include/frame_kern.h with 100% similarity]
arch/um/include/shared/init.h [moved from arch/um/include/init.h with 100% similarity]
arch/um/include/shared/initrd.h [moved from arch/um/include/initrd.h with 100% similarity]
arch/um/include/shared/irq_kern.h [moved from arch/um/include/irq_kern.h with 100% similarity]
arch/um/include/shared/irq_user.h [moved from arch/um/include/irq_user.h with 100% similarity]
arch/um/include/shared/kern.h [moved from arch/um/include/kern.h with 100% similarity]
arch/um/include/shared/kern_util.h [moved from arch/um/include/kern_util.h with 100% similarity]
arch/um/include/shared/ldt.h [moved from include/asm-um/ldt.h with 95% similarity]
arch/um/include/shared/line.h [moved from arch/um/include/line.h with 100% similarity]
arch/um/include/shared/longjmp.h [moved from arch/um/include/longjmp.h with 100% similarity]
arch/um/include/shared/mconsole.h [moved from arch/um/include/mconsole.h with 100% similarity]
arch/um/include/shared/mconsole_kern.h [moved from arch/um/include/mconsole_kern.h with 100% similarity]
arch/um/include/shared/mem.h [moved from arch/um/include/mem.h with 100% similarity]
arch/um/include/shared/mem_kern.h [moved from arch/um/include/mem_kern.h with 100% similarity]
arch/um/include/shared/mem_user.h [moved from arch/um/include/mem_user.h with 100% similarity]
arch/um/include/shared/net_kern.h [moved from arch/um/include/net_kern.h with 100% similarity]
arch/um/include/shared/net_user.h [moved from arch/um/include/net_user.h with 100% similarity]
arch/um/include/shared/os.h [moved from arch/um/include/os.h with 99% similarity]
arch/um/include/shared/process.h [moved from arch/um/include/process.h with 100% similarity]
arch/um/include/shared/ptrace_user.h [moved from arch/um/include/ptrace_user.h with 100% similarity]
arch/um/include/shared/registers.h [moved from arch/um/include/registers.h with 100% similarity]
arch/um/include/shared/sigio.h [moved from arch/um/include/sigio.h with 100% similarity]
arch/um/include/shared/skas/mm_id.h [moved from arch/um/include/skas/mm_id.h with 100% similarity]
arch/um/include/shared/skas/proc_mm.h [moved from arch/um/include/skas/proc_mm.h with 100% similarity]
arch/um/include/shared/skas/skas.h [moved from arch/um/include/skas/skas.h with 100% similarity]
arch/um/include/shared/skas/stub-data.h [moved from arch/um/include/skas/stub-data.h with 100% similarity]
arch/um/include/shared/skas_ptrace.h [moved from arch/um/include/skas_ptrace.h with 100% similarity]
arch/um/include/shared/skas_ptregs.h [moved from arch/um/include/skas_ptregs.h with 100% similarity]
arch/um/include/shared/syscall.h [moved from arch/um/include/syscall.h with 100% similarity]
arch/um/include/shared/sysrq.h [moved from arch/um/include/sysrq.h with 100% similarity]
arch/um/include/shared/task.h [moved from arch/um/include/task.h with 100% similarity]
arch/um/include/shared/tlb.h [moved from arch/um/include/tlb.h with 100% similarity]
arch/um/include/shared/ubd_user.h [moved from arch/um/include/ubd_user.h with 100% similarity]
arch/um/include/shared/um_malloc.h [moved from arch/um/include/um_malloc.h with 100% similarity]
arch/um/include/shared/um_mmu.h [moved from arch/um/include/um_mmu.h with 91% similarity]
arch/um/include/shared/um_uaccess.h [moved from arch/um/include/um_uaccess.h with 100% similarity]
arch/um/include/shared/user.h [moved from arch/um/include/user.h with 97% similarity]
arch/um/include/sigcontext.h [deleted file]
arch/um/kernel/exec.c
arch/um/kernel/internal.h [new file with mode: 0644]
arch/um/kernel/signal.c
arch/um/kernel/syscall.c
arch/um/os-Linux/include/file.h [deleted file]
arch/um/os-Linux/skas/mem.c
arch/um/sys-i386/asm/archparam.h [moved from include/asm-um/archparam-i386.h with 77% similarity]
arch/um/sys-i386/asm/elf.h [moved from include/asm-um/elf-i386.h with 100% similarity]
arch/um/sys-i386/asm/module.h [moved from include/asm-um/module-i386.h with 100% similarity]
arch/um/sys-i386/asm/processor.h [moved from include/asm-um/processor-i386.h with 97% similarity]
arch/um/sys-i386/asm/ptrace.h [moved from include/asm-um/ptrace-i386.h with 93% similarity]
arch/um/sys-i386/shared/sysdep/archsetjmp.h [moved from arch/um/include/sysdep-i386/archsetjmp.h with 100% similarity]
arch/um/sys-i386/shared/sysdep/barrier.h [moved from arch/um/include/sysdep-i386/barrier.h with 100% similarity]
arch/um/sys-i386/shared/sysdep/checksum.h [moved from arch/um/include/sysdep-i386/checksum.h with 100% similarity]
arch/um/sys-i386/shared/sysdep/faultinfo.h [moved from arch/um/include/sysdep-i386/faultinfo.h with 100% similarity]
arch/um/sys-i386/shared/sysdep/host_ldt.h [moved from include/asm-um/host_ldt-i386.h with 97% similarity]
arch/um/sys-i386/shared/sysdep/kernel-offsets.h [moved from arch/um/include/sysdep-i386/kernel-offsets.h with 100% similarity]
arch/um/sys-i386/shared/sysdep/ptrace.h [moved from arch/um/include/sysdep-i386/ptrace.h with 99% similarity]
arch/um/sys-i386/shared/sysdep/ptrace_user.h [moved from arch/um/include/sysdep-i386/ptrace_user.h with 100% similarity]
arch/um/sys-i386/shared/sysdep/sc.h [moved from arch/um/include/sysdep-i386/sc.h with 100% similarity]
arch/um/sys-i386/shared/sysdep/sigcontext.h [moved from arch/um/include/sysdep-i386/sigcontext.h with 100% similarity]
arch/um/sys-i386/shared/sysdep/skas_ptrace.h [moved from arch/um/include/sysdep-i386/skas_ptrace.h with 100% similarity]
arch/um/sys-i386/shared/sysdep/stub.h [moved from arch/um/include/sysdep-i386/stub.h with 98% similarity]
arch/um/sys-i386/shared/sysdep/syscalls.h [moved from arch/um/include/sysdep-i386/syscalls.h with 100% similarity]
arch/um/sys-i386/shared/sysdep/system.h [new file with mode: 0644]
arch/um/sys-i386/shared/sysdep/tls.h [moved from arch/um/include/sysdep-i386/tls.h with 97% similarity]
arch/um/sys-i386/shared/sysdep/vm-flags.h [moved from include/asm-um/vm-flags-i386.h with 100% similarity]
arch/um/sys-i386/stub.S
arch/um/sys-i386/syscalls.c
arch/um/sys-ia64/sysdep/ptrace.h [moved from arch/um/include/sysdep-ia64/ptrace.h with 100% similarity]
arch/um/sys-ia64/sysdep/sigcontext.h [moved from arch/um/include/sysdep-ia64/sigcontext.h with 100% similarity]
arch/um/sys-ia64/sysdep/skas_ptrace.h [moved from arch/um/include/sysdep-ia64/skas_ptrace.h with 100% similarity]
arch/um/sys-ia64/sysdep/syscalls.h [moved from arch/um/include/sysdep-ia64/syscalls.h with 100% similarity]
arch/um/sys-ppc/asm/archparam.h [moved from include/asm-um/archparam-ppc.h with 100% similarity]
arch/um/sys-ppc/asm/elf.h [moved from include/asm-um/elf-ppc.h with 100% similarity]
arch/um/sys-ppc/asm/processor.h [moved from include/asm-um/processor-ppc.h with 100% similarity]
arch/um/sys-ppc/shared/sysdep/ptrace.h [moved from arch/um/include/sysdep-ppc/ptrace.h with 100% similarity]
arch/um/sys-ppc/shared/sysdep/sigcontext.h [moved from arch/um/include/sysdep-ppc/sigcontext.h with 100% similarity]
arch/um/sys-ppc/shared/sysdep/skas_ptrace.h [moved from arch/um/include/sysdep-ppc/skas_ptrace.h with 100% similarity]
arch/um/sys-ppc/shared/sysdep/syscalls.h [moved from arch/um/include/sysdep-ppc/syscalls.h with 100% similarity]
arch/um/sys-x86_64/asm/archparam.h [moved from include/asm-um/archparam-x86_64.h with 100% similarity]
arch/um/sys-x86_64/asm/elf.h [moved from include/asm-um/elf-x86_64.h with 100% similarity]
arch/um/sys-x86_64/asm/module.h [moved from include/asm-um/module-x86_64.h with 100% similarity]
arch/um/sys-x86_64/asm/processor.h [moved from include/asm-um/processor-x86_64.h with 97% similarity]
arch/um/sys-x86_64/asm/ptrace.h [moved from include/asm-um/ptrace-x86_64.h with 85% similarity]
arch/um/sys-x86_64/shared/sysdep/archsetjmp.h [moved from arch/um/include/sysdep-x86_64/archsetjmp.h with 100% similarity]
arch/um/sys-x86_64/shared/sysdep/barrier.h [moved from arch/um/include/sysdep-x86_64/barrier.h with 100% similarity]
arch/um/sys-x86_64/shared/sysdep/checksum.h [moved from arch/um/include/sysdep-x86_64/checksum.h with 100% similarity]
arch/um/sys-x86_64/shared/sysdep/faultinfo.h [moved from arch/um/include/sysdep-x86_64/faultinfo.h with 100% similarity]
arch/um/sys-x86_64/shared/sysdep/host_ldt.h [moved from include/asm-um/host_ldt-x86_64.h with 97% similarity]
arch/um/sys-x86_64/shared/sysdep/kernel-offsets.h [moved from arch/um/include/sysdep-x86_64/kernel-offsets.h with 100% similarity]
arch/um/sys-x86_64/shared/sysdep/ptrace.h [moved from arch/um/include/sysdep-x86_64/ptrace.h with 99% similarity]
arch/um/sys-x86_64/shared/sysdep/ptrace_user.h [moved from arch/um/include/sysdep-x86_64/ptrace_user.h with 100% similarity]
arch/um/sys-x86_64/shared/sysdep/sc.h [moved from arch/um/include/sysdep-x86_64/sc.h with 100% similarity]
arch/um/sys-x86_64/shared/sysdep/sigcontext.h [moved from arch/um/include/sysdep-x86_64/sigcontext.h with 100% similarity]
arch/um/sys-x86_64/shared/sysdep/skas_ptrace.h [moved from arch/um/include/sysdep-x86_64/skas_ptrace.h with 100% similarity]
arch/um/sys-x86_64/shared/sysdep/stub.h [moved from arch/um/include/sysdep-x86_64/stub.h with 98% similarity]
arch/um/sys-x86_64/shared/sysdep/syscalls.h [moved from arch/um/include/sysdep-x86_64/syscalls.h with 100% similarity]
arch/um/sys-x86_64/shared/sysdep/system.h [new file with mode: 0644]
arch/um/sys-x86_64/shared/sysdep/tls.h [moved from arch/um/include/sysdep-x86_64/tls.h with 96% similarity]
arch/um/sys-x86_64/shared/sysdep/vm-flags.h [moved from include/asm-um/vm-flags-x86_64.h with 100% similarity]
arch/um/sys-x86_64/stub.S
arch/um/sys-x86_64/syscall_table.c
arch/x86/Makefile
arch/x86/boot/compressed/misc.c
arch/x86/include/asm/Kbuild [moved from include/asm-x86/Kbuild with 100% similarity]
arch/x86/include/asm/a.out-core.h [moved from include/asm-x86/a.out-core.h with 95% similarity]
arch/x86/include/asm/a.out.h [moved from include/asm-x86/a.out.h with 88% similarity]
arch/x86/include/asm/acpi.h [moved from include/asm-x86/acpi.h with 98% similarity]
arch/x86/include/asm/agp.h [moved from include/asm-x86/agp.h with 93% similarity]
arch/x86/include/asm/alternative-asm.h [moved from include/asm-x86/alternative-asm.h with 100% similarity]
arch/x86/include/asm/alternative.h [moved from include/asm-x86/alternative.h with 98% similarity]
arch/x86/include/asm/amd_iommu.h [moved from include/asm-x86/amd_iommu.h with 92% similarity]
arch/x86/include/asm/amd_iommu_types.h [moved from include/asm-x86/amd_iommu_types.h with 99% similarity]
arch/x86/include/asm/apic.h [moved from include/asm-x86/apic.h with 98% similarity]
arch/x86/include/asm/apicdef.h [moved from include/asm-x86/apicdef.h with 99% similarity]
arch/x86/include/asm/arch_hooks.h [moved from include/asm-x86/arch_hooks.h with 86% similarity]
arch/x86/include/asm/asm.h [moved from include/asm-x86/asm.h with 93% similarity]
arch/x86/include/asm/atomic.h [moved from include/asm-x86/atomic.h with 100% similarity]
arch/x86/include/asm/atomic_32.h [moved from include/asm-x86/atomic_32.h with 98% similarity]
arch/x86/include/asm/atomic_64.h [moved from include/asm-x86/atomic_64.h with 99% similarity]
arch/x86/include/asm/auxvec.h [moved from include/asm-x86/auxvec.h with 70% similarity]
arch/x86/include/asm/bigsmp/apic.h [moved from include/asm-x86/bigsmp/apic.h with 100% similarity]
arch/x86/include/asm/bigsmp/apicdef.h [moved from include/asm-x86/bigsmp/apicdef.h with 100% similarity]
arch/x86/include/asm/bigsmp/ipi.h [moved from include/asm-x86/bigsmp/ipi.h with 100% similarity]
arch/x86/include/asm/bios_ebda.h [moved from include/asm-x86/bios_ebda.h with 88% similarity]
arch/x86/include/asm/bitops.h [moved from include/asm-x86/bitops.h with 99% similarity]
arch/x86/include/asm/boot.h [moved from include/asm-x86/boot.h with 89% similarity]
arch/x86/include/asm/bootparam.h [moved from include/asm-x86/bootparam.h with 96% similarity]
arch/x86/include/asm/bug.h [moved from include/asm-x86/bug.h with 90% similarity]
arch/x86/include/asm/bugs.h [moved from include/asm-x86/bugs.h with 71% similarity]
arch/x86/include/asm/byteorder.h [moved from include/asm-x86/byteorder.h with 94% similarity]
arch/x86/include/asm/cache.h [moved from include/asm-x86/cache.h with 85% similarity]
arch/x86/include/asm/cacheflush.h [moved from include/asm-x86/cacheflush.h with 97% similarity]
arch/x86/include/asm/calgary.h [moved from include/asm-x86/calgary.h with 96% similarity]
arch/x86/include/asm/calling.h [moved from include/asm-x86/calling.h with 100% similarity]
arch/x86/include/asm/checksum.h [moved from include/asm-x86/checksum.h with 100% similarity]
arch/x86/include/asm/checksum_32.h [moved from include/asm-x86/checksum_32.h with 97% similarity]
arch/x86/include/asm/checksum_64.h [moved from include/asm-x86/checksum_64.h with 98% similarity]
arch/x86/include/asm/cmpxchg.h [moved from include/asm-x86/cmpxchg.h with 100% similarity]
arch/x86/include/asm/cmpxchg_32.h [moved from include/asm-x86/cmpxchg_32.h with 98% similarity]
arch/x86/include/asm/cmpxchg_64.h [moved from include/asm-x86/cmpxchg_64.h with 97% similarity]
arch/x86/include/asm/compat.h [moved from include/asm-x86/compat.h with 98% similarity]
arch/x86/include/asm/cpu.h [moved from include/asm-x86/cpu.h with 80% similarity]
arch/x86/include/asm/cpufeature.h [moved from include/asm-x86/cpufeature.h with 99% similarity]
arch/x86/include/asm/cputime.h [moved from include/asm-x86/cputime.h with 100% similarity]
arch/x86/include/asm/current.h [moved from include/asm-x86/current.h with 87% similarity]
arch/x86/include/asm/debugreg.h [moved from include/asm-x86/debugreg.h with 96% similarity]
arch/x86/include/asm/delay.h [moved from include/asm-x86/delay.h with 90% similarity]
arch/x86/include/asm/desc.h [moved from include/asm-x86/desc.h with 99% similarity]
arch/x86/include/asm/desc_defs.h [moved from include/asm-x86/desc_defs.h with 96% similarity]
arch/x86/include/asm/device.h [moved from include/asm-x86/device.h with 72% similarity]
arch/x86/include/asm/div64.h [moved from include/asm-x86/div64.h with 94% similarity]
arch/x86/include/asm/dma-mapping.h [moved from include/asm-x86/dma-mapping.h with 98% similarity]
arch/x86/include/asm/dma.h [moved from include/asm-x86/dma.h with 99% similarity]
arch/x86/include/asm/dmi.h [moved from include/asm-x86/dmi.h with 88% similarity]
arch/x86/include/asm/ds.h [moved from include/asm-x86/ds.h with 98% similarity]
arch/x86/include/asm/dwarf2.h [moved from include/asm-x86/dwarf2.h with 95% similarity]
arch/x86/include/asm/e820.h [moved from include/asm-x86/e820.h with 98% similarity]
arch/x86/include/asm/edac.h [moved from include/asm-x86/edac.h with 82% similarity]
arch/x86/include/asm/efi.h [moved from include/asm-x86/efi.h with 98% similarity]
arch/x86/include/asm/elf.h [moved from include/asm-x86/elf.h with 99% similarity]
arch/x86/include/asm/emergency-restart.h [moved from include/asm-x86/emergency-restart.h with 65% similarity]
arch/x86/include/asm/errno.h [moved from include/asm-x86/errno.h with 100% similarity]
arch/x86/include/asm/es7000/apic.h [moved from include/asm-x86/es7000/apic.h with 100% similarity]
arch/x86/include/asm/es7000/apicdef.h [moved from include/asm-x86/es7000/apicdef.h with 100% similarity]
arch/x86/include/asm/es7000/ipi.h [moved from include/asm-x86/es7000/ipi.h with 100% similarity]
arch/x86/include/asm/es7000/mpparse.h [moved from include/asm-x86/es7000/mpparse.h with 100% similarity]
arch/x86/include/asm/es7000/wakecpu.h [moved from include/asm-x86/es7000/wakecpu.h with 100% similarity]
arch/x86/include/asm/fb.h [moved from include/asm-x86/fb.h with 85% similarity]
arch/x86/include/asm/fcntl.h [moved from include/asm-x86/fcntl.h with 100% similarity]
arch/x86/include/asm/fixmap.h [moved from include/asm-x86/fixmap.h with 95% similarity]
arch/x86/include/asm/fixmap_32.h [moved from include/asm-x86/fixmap_32.h with 97% similarity]
arch/x86/include/asm/fixmap_64.h [moved from include/asm-x86/fixmap_64.h with 96% similarity]
arch/x86/include/asm/floppy.h [moved from include/asm-x86/floppy.h with 98% similarity]
arch/x86/include/asm/frame.h [moved from include/asm-x86/frame.h with 100% similarity]
arch/x86/include/asm/ftrace.h [moved from include/asm-x86/ftrace.h with 84% similarity]
arch/x86/include/asm/futex.h [moved from include/asm-x86/futex.h with 97% similarity]
arch/x86/include/asm/gart.h [moved from include/asm-x86/gart.h with 95% similarity]
arch/x86/include/asm/genapic.h [moved from include/asm-x86/genapic.h with 100% similarity]
arch/x86/include/asm/genapic_32.h [moved from include/asm-x86/genapic_32.h with 97% similarity]
arch/x86/include/asm/genapic_64.h [moved from include/asm-x86/genapic_64.h with 94% similarity]
arch/x86/include/asm/geode.h [moved from include/asm-x86/geode.h with 98% similarity]
arch/x86/include/asm/gpio.h [moved from include/asm-x86/gpio.h with 92% similarity]
arch/x86/include/asm/hardirq.h [moved from include/asm-x86/hardirq.h with 100% similarity]
arch/x86/include/asm/hardirq_32.h [moved from include/asm-x86/hardirq_32.h with 87% similarity]
arch/x86/include/asm/hardirq_64.h [moved from include/asm-x86/hardirq_64.h with 84% similarity]
arch/x86/include/asm/highmem.h [moved from include/asm-x86/highmem.h with 96% similarity]
arch/x86/include/asm/hpet.h [moved from include/asm-x86/hpet.h with 97% similarity]
arch/x86/include/asm/hugetlb.h [moved from include/asm-x86/hugetlb.h with 95% similarity]
arch/x86/include/asm/hw_irq.h [moved from include/asm-x86/hw_irq.h with 97% similarity]
arch/x86/include/asm/hypertransport.h [moved from include/asm-x86/hypertransport.h with 91% similarity]
arch/x86/include/asm/i387.h [moved from include/asm-x86/i387.h with 99% similarity]
arch/x86/include/asm/i8253.h [moved from include/asm-x86/i8253.h with 77% similarity]
arch/x86/include/asm/i8259.h [moved from include/asm-x86/i8259.h with 95% similarity]
arch/x86/include/asm/ia32.h [moved from include/asm-x86/ia32.h with 97% similarity]
arch/x86/include/asm/ia32_unistd.h [moved from include/asm-x86/ia32_unistd.h with 81% similarity]
arch/x86/include/asm/idle.h [moved from include/asm-x86/idle.h with 76% similarity]
arch/x86/include/asm/intel_arch_perfmon.h [moved from include/asm-x86/intel_arch_perfmon.h with 87% similarity]
arch/x86/include/asm/io.h [moved from include/asm-x86/io.h with 97% similarity]
arch/x86/include/asm/io_32.h [moved from include/asm-x86/io_32.h with 98% similarity]
arch/x86/include/asm/io_64.h [moved from include/asm-x86/io_64.h with 98% similarity]
arch/x86/include/asm/io_apic.h [moved from include/asm-x86/io_apic.h with 98% similarity]
arch/x86/include/asm/ioctl.h [moved from include/asm-x86/ioctl.h with 100% similarity]
arch/x86/include/asm/ioctls.h [moved from include/asm-x86/ioctls.h with 97% similarity]
arch/x86/include/asm/iommu.h [moved from include/asm-x86/iommu.h with 93% similarity]
arch/x86/include/asm/ipcbuf.h [moved from include/asm-x86/ipcbuf.h with 86% similarity]
arch/x86/include/asm/ipi.h [moved from include/asm-x86/ipi.h with 97% similarity]
arch/x86/include/asm/irq.h [moved from include/asm-x86/irq.h with 93% similarity]
arch/x86/include/asm/irq_regs.h [moved from include/asm-x86/irq_regs.h with 100% similarity]
arch/x86/include/asm/irq_regs_32.h [moved from include/asm-x86/irq_regs_32.h with 84% similarity]
arch/x86/include/asm/irq_regs_64.h [moved from include/asm-x86/irq_regs_64.h with 100% similarity]
arch/x86/include/asm/irq_remapping.h [new file with mode: 0644]
arch/x86/include/asm/irq_vectors.h [moved from include/asm-x86/irq_vectors.h with 97% similarity]
arch/x86/include/asm/irqflags.h [moved from include/asm-x86/irqflags.h with 100% similarity]
arch/x86/include/asm/ist.h [moved from include/asm-x86/ist.h with 91% similarity]
arch/x86/include/asm/k8.h [moved from include/asm-x86/k8.h with 81% similarity]
arch/x86/include/asm/kdebug.h [moved from include/asm-x86/kdebug.h with 90% similarity]
arch/x86/include/asm/kexec.h [moved from include/asm-x86/kexec.h with 98% similarity]
arch/x86/include/asm/kgdb.h [moved from include/asm-x86/kgdb.h with 95% similarity]
arch/x86/include/asm/kmap_types.h [moved from include/asm-x86/kmap_types.h with 81% similarity]
arch/x86/include/asm/kprobes.h [moved from include/asm-x86/kprobes.h with 96% similarity]
arch/x86/include/asm/kvm.h [moved from include/asm-x86/kvm.h with 98% similarity]
arch/x86/include/asm/kvm_host.h [moved from include/asm-x86/kvm_host.h with 99% similarity]
arch/x86/include/asm/kvm_para.h [moved from include/asm-x86/kvm_para.h with 97% similarity]
arch/x86/include/asm/kvm_x86_emulate.h [moved from include/asm-x86/kvm_x86_emulate.h with 98% similarity]
arch/x86/include/asm/ldt.h [moved from include/asm-x86/ldt.h with 92% similarity]
arch/x86/include/asm/lguest.h [moved from include/asm-x86/lguest.h with 96% similarity]
arch/x86/include/asm/lguest_hcall.h [moved from include/asm-x86/lguest_hcall.h with 95% similarity]
arch/x86/include/asm/linkage.h [moved from include/asm-x86/linkage.h with 95% similarity]
arch/x86/include/asm/local.h [moved from include/asm-x86/local.h with 98% similarity]
arch/x86/include/asm/mach-default/apm.h [moved from include/asm-x86/mach-default/apm.h with 93% similarity]
arch/x86/include/asm/mach-default/do_timer.h [moved from include/asm-x86/mach-default/do_timer.h with 100% similarity]
arch/x86/include/asm/mach-default/entry_arch.h [moved from include/asm-x86/mach-default/entry_arch.h with 100% similarity]
arch/x86/include/asm/mach-default/mach_apic.h [moved from include/asm-x86/mach-default/mach_apic.h with 96% similarity]
arch/x86/include/asm/mach-default/mach_apicdef.h [moved from include/asm-x86/mach-default/mach_apicdef.h with 76% similarity]
arch/x86/include/asm/mach-default/mach_ipi.h [moved from include/asm-x86/mach-default/mach_ipi.h with 91% similarity]
arch/x86/include/asm/mach-default/mach_mpparse.h [moved from include/asm-x86/mach-default/mach_mpparse.h with 62% similarity]
arch/x86/include/asm/mach-default/mach_mpspec.h [new file with mode: 0644]
arch/x86/include/asm/mach-default/mach_timer.h [moved from include/asm-x86/mach-default/mach_timer.h with 91% similarity]
arch/x86/include/asm/mach-default/mach_traps.h [moved from include/asm-x86/mach-default/mach_traps.h with 80% similarity]
arch/x86/include/asm/mach-default/mach_wakecpu.h [moved from include/asm-x86/mach-default/mach_wakecpu.h with 85% similarity]
arch/x86/include/asm/mach-default/pci-functions.h [moved from include/asm-x86/mach-default/pci-functions.h with 100% similarity]
arch/x86/include/asm/mach-default/setup_arch.h [moved from include/asm-x86/mach-default/setup_arch.h with 100% similarity]
arch/x86/include/asm/mach-default/smpboot_hooks.h [moved from include/asm-x86/mach-default/smpboot_hooks.h with 100% similarity]
arch/x86/include/asm/mach-generic/gpio.h [moved from include/asm-x86/mach-generic/gpio.h with 76% similarity]
arch/x86/include/asm/mach-generic/mach_apic.h [moved from include/asm-x86/mach-generic/mach_apic.h with 91% similarity]
arch/x86/include/asm/mach-generic/mach_apicdef.h [moved from include/asm-x86/mach-generic/mach_apicdef.h with 50% similarity]
arch/x86/include/asm/mach-generic/mach_ipi.h [moved from include/asm-x86/mach-generic/mach_ipi.h with 57% similarity]
arch/x86/include/asm/mach-generic/mach_mpparse.h [moved from include/asm-x86/mach-generic/mach_mpparse.h with 52% similarity]
arch/x86/include/asm/mach-generic/mach_mpspec.h [moved from include/asm-x86/mach-generic/mach_mpspec.h with 67% similarity]
arch/x86/include/asm/mach-rdc321x/gpio.h [moved from include/asm-x86/mach-rdc321x/gpio.h with 91% similarity]
arch/x86/include/asm/mach-rdc321x/rdc321x_defs.h [moved from include/asm-x86/mach-rdc321x/rdc321x_defs.h with 100% similarity]
arch/x86/include/asm/mach-voyager/do_timer.h [moved from include/asm-x86/mach-voyager/do_timer.h with 100% similarity]
arch/x86/include/asm/mach-voyager/entry_arch.h [moved from include/asm-x86/mach-voyager/entry_arch.h with 100% similarity]
arch/x86/include/asm/mach-voyager/setup_arch.h [moved from include/asm-x86/mach-voyager/setup_arch.h with 100% similarity]
arch/x86/include/asm/math_emu.h [moved from include/asm-x86/math_emu.h with 86% similarity]
arch/x86/include/asm/mc146818rtc.h [moved from include/asm-x86/mc146818rtc.h with 96% similarity]
arch/x86/include/asm/mca.h [moved from include/asm-x86/mca.h with 94% similarity]
arch/x86/include/asm/mca_dma.h [moved from include/asm-x86/mca_dma.h with 98% similarity]
arch/x86/include/asm/mce.h [moved from include/asm-x86/mce.h with 97% similarity]
arch/x86/include/asm/microcode.h [moved from include/asm-x86/microcode.h with 91% similarity]
arch/x86/include/asm/mman.h [moved from include/asm-x86/mman.h with 90% similarity]
arch/x86/include/asm/mmconfig.h [moved from include/asm-x86/mmconfig.h with 74% similarity]
arch/x86/include/asm/mmu.h [moved from include/asm-x86/mmu.h with 81% similarity]
arch/x86/include/asm/mmu_context.h [moved from include/asm-x86/mmu_context.h with 87% similarity]
arch/x86/include/asm/mmu_context_32.h [moved from include/asm-x86/mmu_context_32.h with 92% similarity]
arch/x86/include/asm/mmu_context_64.h [moved from include/asm-x86/mmu_context_64.h with 92% similarity]
arch/x86/include/asm/mmx.h [moved from include/asm-x86/mmx.h with 75% similarity]
arch/x86/include/asm/mmzone.h [moved from include/asm-x86/mmzone.h with 100% similarity]
arch/x86/include/asm/mmzone_32.h [moved from include/asm-x86/mmzone_32.h with 97% similarity]
arch/x86/include/asm/mmzone_64.h [moved from include/asm-x86/mmzone_64.h with 93% similarity]
arch/x86/include/asm/module.h [moved from include/asm-x86/module.h with 96% similarity]
arch/x86/include/asm/mpspec.h [moved from include/asm-x86/mpspec.h with 97% similarity]
arch/x86/include/asm/mpspec_def.h [moved from include/asm-x86/mpspec_def.h with 97% similarity]
arch/x86/include/asm/msgbuf.h [moved from include/asm-x86/msgbuf.h with 92% similarity]
arch/x86/include/asm/msidef.h [moved from include/asm-x86/msidef.h with 95% similarity]
arch/x86/include/asm/msr-index.h [moved from include/asm-x86/msr-index.h with 99% similarity]
arch/x86/include/asm/msr.h [moved from include/asm-x86/msr.h with 98% similarity]
arch/x86/include/asm/mtrr.h [moved from include/asm-x86/mtrr.h with 98% similarity]
arch/x86/include/asm/mutex.h [moved from include/asm-x86/mutex.h with 100% similarity]
arch/x86/include/asm/mutex_32.h [moved from include/asm-x86/mutex_32.h with 97% similarity]
arch/x86/include/asm/mutex_64.h [moved from include/asm-x86/mutex_64.h with 96% similarity]
arch/x86/include/asm/nmi.h [moved from include/asm-x86/nmi.h with 96% similarity]
arch/x86/include/asm/nops.h [moved from include/asm-x86/nops.h with 97% similarity]
arch/x86/include/asm/numa.h [moved from include/asm-x86/numa.h with 100% similarity]
arch/x86/include/asm/numa_32.h [moved from include/asm-x86/numa_32.h with 62% similarity]
arch/x86/include/asm/numa_64.h [moved from include/asm-x86/numa_64.h with 92% similarity]
arch/x86/include/asm/numaq.h [moved from include/asm-x86/numaq.h with 98% similarity]
arch/x86/include/asm/numaq/apic.h [moved from include/asm-x86/numaq/apic.h with 100% similarity]
arch/x86/include/asm/numaq/apicdef.h [moved from include/asm-x86/numaq/apicdef.h with 100% similarity]
arch/x86/include/asm/numaq/ipi.h [moved from include/asm-x86/numaq/ipi.h with 100% similarity]
arch/x86/include/asm/numaq/mpparse.h [moved from include/asm-x86/numaq/mpparse.h with 100% similarity]
arch/x86/include/asm/numaq/wakecpu.h [moved from include/asm-x86/numaq/wakecpu.h with 100% similarity]
arch/x86/include/asm/olpc.h [moved from include/asm-x86/olpc.h with 97% similarity]
arch/x86/include/asm/page.h [moved from include/asm-x86/page.h with 98% similarity]
arch/x86/include/asm/page_32.h [moved from include/asm-x86/page_32.h with 97% similarity]
arch/x86/include/asm/page_64.h [moved from include/asm-x86/page_64.h with 97% similarity]
arch/x86/include/asm/param.h [moved from include/asm-x86/param.h with 82% similarity]
arch/x86/include/asm/paravirt.h [moved from include/asm-x86/paravirt.h with 99% similarity]
arch/x86/include/asm/parport.h [moved from include/asm-x86/parport.h with 70% similarity]
arch/x86/include/asm/pat.h [moved from include/asm-x86/pat.h with 86% similarity]
arch/x86/include/asm/pci-direct.h [moved from include/asm-x86/pci-direct.h with 88% similarity]
arch/x86/include/asm/pci.h [moved from include/asm-x86/pci.h with 97% similarity]
arch/x86/include/asm/pci_32.h [moved from include/asm-x86/pci_32.h with 91% similarity]
arch/x86/include/asm/pci_64.h [moved from include/asm-x86/pci_64.h with 95% similarity]
arch/x86/include/asm/pda.h [moved from include/asm-x86/pda.h with 98% similarity]
arch/x86/include/asm/percpu.h [moved from include/asm-x86/percpu.h with 98% similarity]
arch/x86/include/asm/pgalloc.h [moved from include/asm-x86/pgalloc.h with 97% similarity]
arch/x86/include/asm/pgtable-2level-defs.h [moved from include/asm-x86/pgtable-2level-defs.h with 67% similarity]
arch/x86/include/asm/pgtable-2level.h [moved from include/asm-x86/pgtable-2level.h with 94% similarity]
arch/x86/include/asm/pgtable-3level-defs.h [moved from include/asm-x86/pgtable-3level-defs.h with 78% similarity]
arch/x86/include/asm/pgtable-3level.h [moved from include/asm-x86/pgtable-3level.h with 97% similarity]
arch/x86/include/asm/pgtable.h [moved from include/asm-x86/pgtable.h with 99% similarity]
arch/x86/include/asm/pgtable_32.h [moved from include/asm-x86/pgtable_32.h with 98% similarity]
arch/x86/include/asm/pgtable_64.h [moved from include/asm-x86/pgtable_64.h with 98% similarity]
arch/x86/include/asm/poll.h [moved from include/asm-x86/poll.h with 100% similarity]
arch/x86/include/asm/posix_types.h [moved from include/asm-x86/posix_types.h with 100% similarity]
arch/x86/include/asm/posix_types_32.h [moved from include/asm-x86/posix_types_32.h with 95% similarity]
arch/x86/include/asm/posix_types_64.h [moved from include/asm-x86/posix_types_64.h with 96% similarity]
arch/x86/include/asm/prctl.h [moved from include/asm-x86/prctl.h with 58% similarity]
arch/x86/include/asm/processor-cyrix.h [moved from include/asm-x86/processor-cyrix.h with 100% similarity]
arch/x86/include/asm/processor-flags.h [moved from include/asm-x86/processor-flags.h with 96% similarity]
arch/x86/include/asm/processor.h [moved from include/asm-x86/processor.h with 99% similarity]
arch/x86/include/asm/proto.h [moved from include/asm-x86/proto.h with 88% similarity]
arch/x86/include/asm/ptrace-abi.h [moved from include/asm-x86/ptrace-abi.h with 97% similarity]
arch/x86/include/asm/ptrace.h [moved from include/asm-x86/ptrace.h with 98% similarity]
arch/x86/include/asm/pvclock-abi.h [moved from include/asm-x86/pvclock-abi.h with 92% similarity]
arch/x86/include/asm/pvclock.h [moved from include/asm-x86/pvclock.h with 82% similarity]
arch/x86/include/asm/reboot.h [moved from include/asm-x86/reboot.h with 83% similarity]
arch/x86/include/asm/reboot_fixups.h [new file with mode: 0644]
arch/x86/include/asm/required-features.h [moved from include/asm-x86/required-features.h with 94% similarity]
arch/x86/include/asm/resource.h [moved from include/asm-x86/resource.h with 100% similarity]
arch/x86/include/asm/resume-trace.h [moved from include/asm-x86/resume-trace.h with 81% similarity]
arch/x86/include/asm/rio.h [moved from include/asm-x86/rio.h with 97% similarity]
arch/x86/include/asm/rtc.h [moved from include/asm-x86/rtc.h with 100% similarity]
arch/x86/include/asm/rwlock.h [moved from include/asm-x86/rwlock.h with 55% similarity]
arch/x86/include/asm/rwsem.h [moved from include/asm-x86/rwsem.h with 98% similarity]
arch/x86/include/asm/scatterlist.h [moved from include/asm-x86/scatterlist.h with 87% similarity]
arch/x86/include/asm/seccomp.h [moved from include/asm-x86/seccomp.h with 100% similarity]
arch/x86/include/asm/seccomp_32.h [moved from include/asm-x86/seccomp_32.h with 74% similarity]
arch/x86/include/asm/seccomp_64.h [moved from include/asm-x86/seccomp_64.h with 84% similarity]
arch/x86/include/asm/sections.h [moved from include/asm-x86/sections.h with 100% similarity]
arch/x86/include/asm/segment.h [moved from include/asm-x86/segment.h with 98% similarity]
arch/x86/include/asm/sembuf.h [moved from include/asm-x86/sembuf.h with 88% similarity]
arch/x86/include/asm/serial.h [moved from include/asm-x86/serial.h with 92% similarity]
arch/x86/include/asm/setup.h [moved from include/asm-x86/setup.h with 96% similarity]
arch/x86/include/asm/shmbuf.h [moved from include/asm-x86/shmbuf.h with 93% similarity]
arch/x86/include/asm/shmparam.h [new file with mode: 0644]
arch/x86/include/asm/sigcontext.h [moved from include/asm-x86/sigcontext.h with 98% similarity]
arch/x86/include/asm/sigcontext32.h [moved from include/asm-x86/sigcontext32.h with 93% similarity]
arch/x86/include/asm/siginfo.h [moved from include/asm-x86/siginfo.h with 56% similarity]
arch/x86/include/asm/signal.h [moved from include/asm-x86/signal.h with 98% similarity]
arch/x86/include/asm/smp.h [moved from include/asm-x86/smp.h with 98% similarity]
arch/x86/include/asm/socket.h [moved from include/asm-x86/socket.h with 93% similarity]
arch/x86/include/asm/sockios.h [moved from include/asm-x86/sockios.h with 76% similarity]
arch/x86/include/asm/sparsemem.h [moved from include/asm-x86/sparsemem.h with 89% similarity]
arch/x86/include/asm/spinlock.h [moved from include/asm-x86/spinlock.h with 99% similarity]
arch/x86/include/asm/spinlock_types.h [moved from include/asm-x86/spinlock_types.h with 74% similarity]
arch/x86/include/asm/srat.h [moved from include/asm-x86/srat.h with 93% similarity]
arch/x86/include/asm/stacktrace.h [moved from include/asm-x86/stacktrace.h with 85% similarity]
arch/x86/include/asm/stat.h [moved from include/asm-x86/stat.h with 96% similarity]
arch/x86/include/asm/statfs.h [moved from include/asm-x86/statfs.h with 76% similarity]
arch/x86/include/asm/string.h [moved from include/asm-x86/string.h with 100% similarity]
arch/x86/include/asm/string_32.h [moved from include/asm-x86/string_32.h with 98% similarity]
arch/x86/include/asm/string_64.h [moved from include/asm-x86/string_64.h with 94% similarity]
arch/x86/include/asm/summit/apic.h [moved from include/asm-x86/summit/apic.h with 100% similarity]
arch/x86/include/asm/summit/apicdef.h [moved from include/asm-x86/summit/apicdef.h with 100% similarity]
arch/x86/include/asm/summit/ipi.h [moved from include/asm-x86/summit/ipi.h with 100% similarity]
arch/x86/include/asm/summit/mpparse.h [moved from include/asm-x86/summit/mpparse.h with 100% similarity]
arch/x86/include/asm/suspend.h [moved from include/asm-x86/suspend.h with 100% similarity]
arch/x86/include/asm/suspend_32.h [moved from include/asm-x86/suspend_32.h with 92% similarity]
arch/x86/include/asm/suspend_64.h [moved from include/asm-x86/suspend_64.h with 92% similarity]
arch/x86/include/asm/swiotlb.h [moved from include/asm-x86/swiotlb.h with 95% similarity]
arch/x86/include/asm/sync_bitops.h [moved from include/asm-x86/sync_bitops.h with 97% similarity]
arch/x86/include/asm/syscall.h [moved from include/asm-x86/syscall.h with 98% similarity]
arch/x86/include/asm/syscalls.h [moved from include/asm-x86/syscalls.h with 100% similarity]
arch/x86/include/asm/system.h [moved from include/asm-x86/system.h with 99% similarity]
arch/x86/include/asm/system_64.h [moved from include/asm-x86/system_64.h with 77% similarity]
arch/x86/include/asm/tce.h [moved from include/asm-x86/tce.h with 95% similarity]
arch/x86/include/asm/termbits.h [moved from include/asm-x86/termbits.h with 98% similarity]
arch/x86/include/asm/termios.h [moved from include/asm-x86/termios.h with 97% similarity]
arch/x86/include/asm/therm_throt.h [new file with mode: 0644]
arch/x86/include/asm/thread_info.h [moved from include/asm-x86/thread_info.h with 98% similarity]
arch/x86/include/asm/time.h [moved from include/asm-x86/time.h with 93% similarity]
arch/x86/include/asm/timer.h [moved from include/asm-x86/timer.h with 95% similarity]
arch/x86/include/asm/timex.h [moved from include/asm-x86/timex.h with 84% similarity]
arch/x86/include/asm/tlb.h [moved from include/asm-x86/tlb.h with 76% similarity]
arch/x86/include/asm/tlbflush.h [moved from include/asm-x86/tlbflush.h with 97% similarity]
arch/x86/include/asm/topology.h [moved from include/asm-x86/topology.h with 98% similarity]
arch/x86/include/asm/trampoline.h [moved from include/asm-x86/trampoline.h with 79% similarity]
arch/x86/include/asm/traps.h [moved from include/asm-x86/traps.h with 97% similarity]
arch/x86/include/asm/tsc.h [moved from include/asm-x86/tsc.h with 93% similarity]
arch/x86/include/asm/types.h [moved from include/asm-x86/types.h with 87% similarity]
arch/x86/include/asm/uaccess.h [moved from include/asm-x86/uaccess.h with 99% similarity]
arch/x86/include/asm/uaccess_32.h [moved from include/asm-x86/uaccess_32.h with 98% similarity]
arch/x86/include/asm/uaccess_64.h [moved from include/asm-x86/uaccess_64.h with 98% similarity]
arch/x86/include/asm/ucontext.h [moved from include/asm-x86/ucontext.h with 81% similarity]
arch/x86/include/asm/unaligned.h [moved from include/asm-x86/unaligned.h with 69% similarity]
arch/x86/include/asm/unistd.h [moved from include/asm-x86/unistd.h with 100% similarity]
arch/x86/include/asm/unistd_32.h [moved from include/asm-x86/unistd_32.h with 99% similarity]
arch/x86/include/asm/unistd_64.h [moved from include/asm-x86/unistd_64.h with 99% similarity]
arch/x86/include/asm/unwind.h [moved from include/asm-x86/unwind.h with 70% similarity]
arch/x86/include/asm/user.h [moved from include/asm-x86/user.h with 100% similarity]
arch/x86/include/asm/user32.h [moved from include/asm-x86/user32.h with 96% similarity]
arch/x86/include/asm/user_32.h [moved from include/asm-x86/user_32.h with 98% similarity]
arch/x86/include/asm/user_64.h [moved from include/asm-x86/user_64.h with 98% similarity]
arch/x86/include/asm/uv/bios.h [moved from include/asm-x86/uv/bios.h with 96% similarity]
arch/x86/include/asm/uv/uv_bau.h [moved from include/asm-x86/uv/uv_bau.h with 99% similarity]
arch/x86/include/asm/uv/uv_hub.h [moved from include/asm-x86/uv/uv_hub.h with 99% similarity]
arch/x86/include/asm/uv/uv_irq.h [moved from include/asm-x86/uv/uv_irq.h with 90% similarity]
arch/x86/include/asm/uv/uv_mmrs.h [moved from include/asm-x86/uv/uv_mmrs.h with 99% similarity]
arch/x86/include/asm/vdso.h [moved from include/asm-x86/vdso.h with 94% similarity]
arch/x86/include/asm/vga.h [moved from include/asm-x86/vga.h with 81% similarity]
arch/x86/include/asm/vgtod.h [moved from include/asm-x86/vgtod.h with 87% similarity]
arch/x86/include/asm/vic.h [moved from include/asm-x86/vic.h with 100% similarity]
arch/x86/include/asm/visws/cobalt.h [moved from include/asm-x86/visws/cobalt.h with 97% similarity]
arch/x86/include/asm/visws/lithium.h [moved from include/asm-x86/visws/lithium.h with 92% similarity]
arch/x86/include/asm/visws/piix4.h [moved from include/asm-x86/visws/piix4.h with 96% similarity]
arch/x86/include/asm/visws/sgivw.h [moved from include/asm-x86/visws/sgivw.h with 100% similarity]
arch/x86/include/asm/vm86.h [moved from include/asm-x86/vm86.h with 98% similarity]
arch/x86/include/asm/vmi.h [moved from include/asm-x86/vmi.h with 100% similarity]
arch/x86/include/asm/vmi_time.h [moved from include/asm-x86/vmi_time.h with 97% similarity]
arch/x86/include/asm/voyager.h [moved from include/asm-x86/voyager.h with 100% similarity]
arch/x86/include/asm/vsyscall.h [moved from include/asm-x86/vsyscall.h with 92% similarity]
arch/x86/include/asm/xcr.h [moved from include/asm-x86/xcr.h with 100% similarity]
arch/x86/include/asm/xen/events.h [moved from include/asm-x86/xen/events.h with 78% similarity]
arch/x86/include/asm/xen/grant_table.h [new file with mode: 0644]
arch/x86/include/asm/xen/hypercall.h [moved from include/asm-x86/xen/hypercall.h with 99% similarity]
arch/x86/include/asm/xen/hypervisor.h [moved from include/asm-x86/xen/hypervisor.h with 96% similarity]
arch/x86/include/asm/xen/interface.h [moved from include/asm-x86/xen/interface.h with 98% similarity]
arch/x86/include/asm/xen/interface_32.h [moved from include/asm-x86/xen/interface_32.h with 95% similarity]
arch/x86/include/asm/xen/interface_64.h [moved from include/asm-x86/xen/interface_64.h with 97% similarity]
arch/x86/include/asm/xen/page.h [moved from include/asm-x86/xen/page.h with 98% similarity]
arch/x86/include/asm/xor.h [moved from include/asm-x86/xor.h with 100% similarity]
arch/x86/include/asm/xor_32.h [moved from include/asm-x86/xor_32.h with 99% similarity]
arch/x86/include/asm/xor_64.h [moved from include/asm-x86/xor_64.h with 98% similarity]
arch/x86/include/asm/xsave.h [moved from include/asm-x86/xsave.h with 100% similarity]
arch/x86/kernel/asm-offsets_64.c
arch/x86/kernel/cpu/Makefile
arch/x86/kernel/syscall_64.c
drivers/xen/cpu_hotplug.c
include/asm-um/a.out.h [deleted file]
include/asm-um/alternative-asm.h [deleted file]
include/asm-um/alternative.h [deleted file]
include/asm-um/asm.h [deleted file]
include/asm-um/atomic.h [deleted file]
include/asm-um/bitops.h [deleted file]
include/asm-um/boot.h [deleted file]
include/asm-um/bug.h [deleted file]
include/asm-um/byteorder.h [deleted file]
include/asm-um/cacheflush.h [deleted file]
include/asm-um/calling.h [deleted file]
include/asm-um/cmpxchg.h [deleted file]
include/asm-um/cobalt.h [deleted file]
include/asm-um/cpufeature.h [deleted file]
include/asm-um/div64.h [deleted file]
include/asm-um/dwarf2.h [deleted file]
include/asm-um/errno.h [deleted file]
include/asm-um/fcntl.h [deleted file]
include/asm-um/floppy.h [deleted file]
include/asm-um/frame.h [deleted file]
include/asm-um/highmem.h [deleted file]
include/asm-um/ide.h [deleted file]
include/asm-um/ioctl.h [deleted file]
include/asm-um/ioctls.h [deleted file]
include/asm-um/ipcbuf.h [deleted file]
include/asm-um/linkage.h [deleted file]
include/asm-um/local.h [deleted file]
include/asm-um/locks.h [deleted file]
include/asm-um/mca_dma.h [deleted file]
include/asm-um/mman.h [deleted file]
include/asm-um/module-generic.h [deleted file]
include/asm-um/msgbuf.h [deleted file]
include/asm-um/mtrr.h [deleted file]
include/asm-um/nops.h [deleted file]
include/asm-um/paravirt.h [deleted file]
include/asm-um/percpu.h [deleted file]
include/asm-um/poll.h [deleted file]
include/asm-um/posix_types.h [deleted file]
include/asm-um/prctl.h [deleted file]
include/asm-um/resource.h [deleted file]
include/asm-um/rwlock.h [deleted file]
include/asm-um/rwsem.h [deleted file]
include/asm-um/scatterlist.h [deleted file]
include/asm-um/sembuf.h [deleted file]
include/asm-um/serial.h [deleted file]
include/asm-um/shmbuf.h [deleted file]
include/asm-um/shmparam.h [deleted file]
include/asm-um/sigcontext-generic.h [deleted file]
include/asm-um/sigcontext-i386.h [deleted file]
include/asm-um/sigcontext-ppc.h [deleted file]
include/asm-um/sigcontext-x86_64.h [deleted file]
include/asm-um/siginfo.h [deleted file]
include/asm-um/signal.h [deleted file]
include/asm-um/socket.h [deleted file]
include/asm-um/sockios.h [deleted file]
include/asm-um/spinlock.h [deleted file]
include/asm-um/spinlock_types.h [deleted file]
include/asm-um/stat.h [deleted file]
include/asm-um/statfs.h [deleted file]
include/asm-um/string.h [deleted file]
include/asm-um/system-i386.h [deleted file]
include/asm-um/system-ppc.h [deleted file]
include/asm-um/system-x86_64.h [deleted file]
include/asm-um/termbits.h [deleted file]
include/asm-um/termios.h [deleted file]
include/asm-um/types.h [deleted file]
include/asm-um/ucontext.h [deleted file]
include/asm-um/unaligned.h [deleted file]
include/asm-um/unistd.h [deleted file]
include/asm-um/user.h [deleted file]
include/asm-um/vga.h [deleted file]
include/asm-um/vm86.h [deleted file]
include/asm-x86/irq_remapping.h [deleted file]
include/asm-x86/mach-default/mach_mpspec.h [deleted file]
include/asm-x86/reboot_fixups.h [deleted file]
include/asm-x86/shmparam.h [deleted file]
include/asm-x86/therm_throt.h [deleted file]
include/asm-x86/xen/grant_table.h [deleted file]
scripts/checksyscalls.sh
scripts/kconfig/Makefile

index 16e3fbb968a8966bc58570ca117349631e81f2d7..f6703f1cd9c717bfaccb09f34a745ee4fd306b98 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -437,7 +437,7 @@ ifeq ($(config-targets),1)
 # KBUILD_DEFCONFIG may point out an alternative default configuration
 # used for 'make defconfig'
 include $(srctree)/arch/$(SRCARCH)/Makefile
-export KBUILD_DEFCONFIG
+export KBUILD_DEFCONFIG KBUILD_KCONFIG
 
 config %config: scripts_basic outputmakefile FORCE
        $(Q)mkdir -p include/linux include/config
index 5e901c75df1bda93122aef924613d8a173cb722f..5c93ddd1e42d414066042ec8e876eba7471b551c 100644 (file)
@@ -1,4 +1,4 @@
-#include <asm-x86/unistd_32.h>
+#include "../../x86/include/asm/unistd_32.h"
 
 unsigned ia32_dir_class[] = {
 #include <asm-generic/audit_dir_write.h>
index a7360cdd99eb783b6249c58428ffb744d46007d3..69f709d8e8e750f781c3b7f2a507dd4043ef49d5 100644 (file)
@@ -122,7 +122,6 @@ typedef struct sigaltstack {
 
 #ifdef __KERNEL__
 struct pt_regs;
-extern void do_signal(struct pt_regs *regs, unsigned long thread_info_flags);
 #define ptrace_signal_deliver(regs, cookie) do { } while (0)
 #endif /* __KERNEL__ */
 
index 28f4b9f5fe5e970a505940acd4268ce355be48c3..b427bf8e1d8fa440b714f730240ceca78ef7b850 100644 (file)
@@ -12,6 +12,8 @@
 
 #define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
 
+extern void do_signal(struct pt_regs *regs, unsigned long thread_info_flags);
+
 extern void __user * get_sigframe(struct k_sigaction *ka, struct pt_regs *regs,
                                  size_t frame_size);
 extern void restore_sigmask(sigset_t *set);
diff --git a/arch/um/Kconfig.common b/arch/um/Kconfig.common
new file mode 100644 (file)
index 0000000..0d207e7
--- /dev/null
@@ -0,0 +1,77 @@
+config DEFCONFIG_LIST
+       string
+       option defconfig_list
+       default "arch/$ARCH/defconfig"
+
+# UML uses the generic IRQ subsystem
+config GENERIC_HARDIRQS
+       bool
+       default y
+
+config UML
+       bool
+       default y
+
+config MMU
+       bool
+       default y
+
+config NO_IOMEM
+       def_bool y
+
+mainmenu "Linux/Usermode Kernel Configuration"
+
+config ISA
+       bool
+
+config SBUS
+       bool
+
+config PCI
+       bool
+
+config PCMCIA
+       bool
+
+# Yet to do!
+config TRACE_IRQFLAGS_SUPPORT
+       bool
+       default n
+
+config LOCKDEP_SUPPORT
+       bool
+       default y
+
+config STACKTRACE_SUPPORT
+       bool
+       default n
+
+config GENERIC_CALIBRATE_DELAY
+       bool
+       default y
+
+config GENERIC_BUG
+       bool
+       default y
+       depends on BUG
+
+config GENERIC_TIME
+       bool
+       default y
+
+config GENERIC_CLOCKEVENTS
+       bool
+       default y
+
+# Used in kernel/irq/manage.c and include/linux/irq.h
+config IRQ_RELEASE_METHOD
+       bool
+       default y
+
+config HZ
+       int
+       default 100
+
+config SUBARCH
+       string
+       option env="SUBARCH"
diff --git a/arch/um/Kconfig.rest b/arch/um/Kconfig.rest
new file mode 100644 (file)
index 0000000..7b5cea7
--- /dev/null
@@ -0,0 +1,42 @@
+source "init/Kconfig"
+
+source "kernel/Kconfig.freezer"
+
+source "drivers/block/Kconfig"
+
+source "arch/um/Kconfig.char"
+
+source "drivers/base/Kconfig"
+
+source "net/Kconfig"
+
+source "arch/um/Kconfig.net"
+
+source "drivers/net/Kconfig"
+
+source "drivers/connector/Kconfig"
+
+source "fs/Kconfig"
+
+source "security/Kconfig"
+
+source "crypto/Kconfig"
+
+source "lib/Kconfig"
+
+source "drivers/scsi/Kconfig"
+
+source "drivers/md/Kconfig"
+
+if BROKEN
+       source "drivers/mtd/Kconfig"
+endif
+
+source "drivers/leds/Kconfig"
+
+#This is just to shut up some Kconfig warnings, so no prompt.
+config INPUT
+       bool
+       default n
+
+source "arch/um/Kconfig.debug"
similarity index 77%
rename from arch/um/Kconfig
rename to arch/um/Kconfig.um
index 393bccfe1785108579dc6c18bab682f2e7984110..ec2b8da1aba483acb7e80b20c2c14041c81f4e7c 100644 (file)
@@ -1,79 +1,3 @@
-config DEFCONFIG_LIST
-       string
-       option defconfig_list
-       default "arch/$ARCH/defconfig"
-
-# UML uses the generic IRQ subsystem
-config GENERIC_HARDIRQS
-       bool
-       default y
-
-config UML
-       bool
-       default y
-
-config MMU
-       bool
-       default y
-
-config NO_IOMEM
-       def_bool y
-
-mainmenu "Linux/Usermode Kernel Configuration"
-
-config ISA
-       bool
-
-config SBUS
-       bool
-
-config PCI
-       bool
-
-config PCMCIA
-       bool
-
-# Yet to do!
-config TRACE_IRQFLAGS_SUPPORT
-       bool
-       default n
-
-config LOCKDEP_SUPPORT
-       bool
-       default y
-
-config STACKTRACE_SUPPORT
-       bool
-       default n
-
-config GENERIC_CALIBRATE_DELAY
-       bool
-       default y
-
-config GENERIC_BUG
-       bool
-       default y
-       depends on BUG
-
-config GENERIC_TIME
-       bool
-       default y
-
-config GENERIC_CLOCKEVENTS
-       bool
-       default y
-
-# Used in kernel/irq/manage.c and include/linux/irq.h
-config IRQ_RELEASE_METHOD
-       bool
-       default y
-
-config HZ
-       int
-       default 100
-
-menu "UML-specific options"
-
 config STATIC_LINK
        bool "Force a static link"
        default n
@@ -85,7 +9,6 @@ config STATIC_LINK
          Additionally, this option enables using higher memory spaces (up to
          2.75G) for UML.
 
-source "arch/um/Kconfig.arch"
 source "mm/Kconfig"
 source "kernel/time/Kconfig"
 
@@ -224,48 +147,3 @@ config KERNEL_STACK_ORDER
          This option determines the size of UML kernel stacks.  They will
          be 1 << order pages.  The default is OK unless you're running Valgrind
          on UML, in which case, set this to 3.
-
-endmenu
-
-source "init/Kconfig"
-
-source "kernel/Kconfig.freezer"
-
-source "drivers/block/Kconfig"
-
-source "arch/um/Kconfig.char"
-
-source "drivers/base/Kconfig"
-
-source "net/Kconfig"
-
-source "arch/um/Kconfig.net"
-
-source "drivers/net/Kconfig"
-
-source "drivers/connector/Kconfig"
-
-source "fs/Kconfig"
-
-source "security/Kconfig"
-
-source "crypto/Kconfig"
-
-source "lib/Kconfig"
-
-source "drivers/scsi/Kconfig"
-
-source "drivers/md/Kconfig"
-
-if BROKEN
-       source "drivers/mtd/Kconfig"
-endif
-
-source "drivers/leds/Kconfig"
-
-#This is just to shut up some Kconfig warnings, so no prompt.
-config INPUT
-       bool
-       default n
-
-source "arch/um/Kconfig.debug"
similarity index 59%
rename from arch/um/Kconfig.i386
rename to arch/um/Kconfig.x86
index 1f57c113df6dab5d6816b829d994958c1ad657e4..5ee328099c6359ae721f919ba554ba53e7052551 100644 (file)
@@ -1,3 +1,7 @@
+source "arch/um/Kconfig.common"
+
+menu "UML-specific options"
+
 menu "Host processor type and features"
 
 source "arch/x86/Kconfig.cpu"
@@ -5,24 +9,25 @@ source "arch/x86/Kconfig.cpu"
 endmenu
 
 config UML_X86
+       def_bool y
+
+config 64BIT
        bool
-       default y
+       default SUBARCH = "x86_64"
 
 config X86_32
-       bool
-       default y
-       select HAVE_AOUT
+       def_bool !64BIT
+       select HAVE_AOUT
 
 config RWSEM_XCHGADD_ALGORITHM
-       def_bool y
+       def_bool X86_XADD
 
-config 64BIT
-       bool
-       default n
+config RWSEM_GENERIC_SPINLOCK
+       def_bool !X86_XADD
 
 config 3_LEVEL_PGTABLES
-       bool "Three-level pagetables (EXPERIMENTAL)"
-       default n
+       bool "Three-level pagetables (EXPERIMENTAL)" if !64BIT
+       default 64BIT
        depends on EXPERIMENTAL
        help
        Three-level pagetables will let UML have more than 4G of physical
@@ -33,13 +38,19 @@ config 3_LEVEL_PGTABLES
        N (on x86-64 it's automatically enabled, instead, as it's safe there).
 
 config ARCH_HAS_SC_SIGNALS
-       bool
-       default y
+       def_bool !64BIT
 
 config ARCH_REUSE_HOST_VSYSCALL_AREA
-       bool
-       default y
+       def_bool !64BIT
+
+config SMP_BROKEN
+       def_bool 64BIT
 
 config GENERIC_HWEIGHT
-       bool
-       default y
+       def_bool y
+
+source "arch/um/Kconfig.um"
+
+endmenu
+
+source "arch/um/Kconfig.rest"
diff --git a/arch/um/Kconfig.x86_64 b/arch/um/Kconfig.x86_64
deleted file mode 100644 (file)
index 40b3407..0000000
+++ /dev/null
@@ -1,39 +0,0 @@
-
-menu "Host processor type and features"
-
-source "arch/x86/Kconfig.cpu"
-
-endmenu
-
-config UML_X86
-       bool
-       default y
-
-config 64BIT
-       bool
-       default y
-
-#XXX: this is so in the underlying arch, but it's wrong!!!
-config RWSEM_GENERIC_SPINLOCK
-       bool
-       default y
-
-config 3_LEVEL_PGTABLES
-       bool
-       default y
-
-config ARCH_HAS_SC_SIGNALS
-       bool
-       default n
-
-config ARCH_REUSE_HOST_VSYSCALL_AREA
-       bool
-       default n
-
-config SMP_BROKEN
-       bool
-       default y
-
-config GENERIC_HWEIGHT
-       bool
-       default y
index ca40397017b98007a1504fb5761624bda030aeab..d944c343acdb26ab68a9d3243fa58c95ee090868 100644 (file)
@@ -18,28 +18,16 @@ core-y                      += $(ARCH_DIR)/kernel/          \
                           $(ARCH_DIR)/drivers/         \
                           $(ARCH_DIR)/os-$(OS)/
 
-# Have to precede the include because the included Makefiles reference them.
-SYMLINK_HEADERS := archparam.h system.h sigcontext.h processor.h ptrace.h \
-       module.h vm-flags.h elf.h host_ldt.h
-SYMLINK_HEADERS := $(foreach header,$(SYMLINK_HEADERS),include/asm-um/$(header))
-
-# XXX: The "os" symlink is only used by arch/um/include/os.h, which includes
-# ../os/include/file.h
-#
-# These are cleaned up during mrproper. Please DO NOT fix it again, this is
-# the Correct Thing(tm) to do!
-ARCH_SYMLINKS = include/asm-um/arch $(ARCH_DIR)/include/sysdep $(ARCH_DIR)/os \
-       $(SYMLINK_HEADERS) $(ARCH_DIR)/include/uml-config.h
-
-MODE_INCLUDE   += -I$(srctree)/$(ARCH_DIR)/include/skas
+MODE_INCLUDE   += -I$(srctree)/$(ARCH_DIR)/include/shared/skas
 
 include $(srctree)/$(ARCH_DIR)/Makefile-skas
 
-ARCH_INCLUDE   := -I$(ARCH_DIR)/include
+ARCH_INCLUDE   := -I$(srctree)/$(ARCH_DIR)/include/shared
+ARCH_INCLUDE   += -I$(srctree)/$(ARCH_DIR)/sys-$(SUBARCH)/shared
 ifneq ($(KBUILD_SRC),)
-ARCH_INCLUDE   += -I$(srctree)/$(ARCH_DIR)/include
+ARCH_INCLUDE   += -I$(ARCH_DIR)/include/shared # for two generated files
 endif
-SYS_DIR                := $(ARCH_DIR)/include/sysdep-$(SUBARCH)
+KBUILD_CPPFLAGS += -I$(srctree)/$(ARCH_DIR)/sys-$(SUBARCH)
 
 # -Dvmap=kernel_vmap prevents anything from referencing the libpcap.o symbol so
 # named - it's a common symbol in libpcap, so we get a binary which crashes.
@@ -65,6 +53,8 @@ include $(srctree)/$(ARCH_DIR)/Makefile-$(SUBARCH)
 #This will adjust *FLAGS accordingly to the platform.
 include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)
 
+KBUILD_CPPFLAGS += -I$(srctree)/arch/$(HEADER_ARCH)/include
+
 # -Derrno=kernel_errno - This turns all kernel references to errno into
 # kernel_errno to separate them from the libc errno.  This allows -fno-common
 # in KBUILD_CFLAGS.  Otherwise, it would cause ld to complain about the two different
@@ -93,14 +83,10 @@ define archhelp
   echo '                  find in the kernel root.'
 endef
 
-ifneq ($(KBUILD_SRC),)
-$(shell mkdir -p $(ARCH_DIR) && ln -fsn $(srctree)/$(ARCH_DIR)/Kconfig.$(SUBARCH) $(ARCH_DIR)/Kconfig.arch)
-else
-$(shell cd $(ARCH_DIR) && ln -sf Kconfig.$(SUBARCH) Kconfig.arch)
-endif
+KBUILD_KCONFIG := arch/um/Kconfig.$(HEADER_ARCH)
 
-archprepare: $(ARCH_SYMLINKS) $(ARCH_DIR)/include/user_constants.h
-prepare: $(ARCH_DIR)/include/kern_constants.h
+archprepare: $(ARCH_DIR)/include/shared/user_constants.h
+prepare: $(ARCH_DIR)/include/shared/kern_constants.h
 
 LINK-$(CONFIG_LD_SCRIPT_STATIC) += -static
 LINK-$(CONFIG_LD_SCRIPT_DYN) += -Wl,-rpath,/lib
@@ -132,62 +118,19 @@ endef
 
 # When cleaning we don't include .config, so we don't include
 # TT or skas makefiles and don't clean skas_ptregs.h.
-CLEAN_FILES += linux x.i gmon.out $(ARCH_DIR)/include/uml-config.h \
-       $(ARCH_DIR)/include/user_constants.h \
-       $(ARCH_DIR)/include/kern_constants.h $(ARCH_DIR)/Kconfig.arch
-
-MRPROPER_FILES += $(ARCH_SYMLINKS)
+CLEAN_FILES += linux x.i gmon.out \
+       $(ARCH_DIR)/include/shared/user_constants.h \
+       $(ARCH_DIR)/include/shared/kern_constants.h
 
 archclean:
        @find . \( -name '*.bb' -o -name '*.bbg' -o -name '*.da' \
                -o -name '*.gcov' \) -type f -print | xargs rm -f
 
-$(SYMLINK_HEADERS):
-       @echo '  SYMLINK $@'
-ifneq ($(KBUILD_SRC),)
-       $(Q)mkdir -p $(objtree)/include/asm-um
-       $(Q)ln -fsn $(srctree)/include/asm-um/$(basename $(notdir $@))-$(SUBARCH)$(suffix $@) $@
-else
-       $(Q)cd $(srctree)/$(dir $@) ; \
-       ln -sf $(basename $(notdir $@))-$(SUBARCH)$(suffix $@) $(notdir $@)
-endif
-
-include/asm-um/arch:
-       @echo '  SYMLINK $@'
-ifneq ($(KBUILD_SRC),)
-       $(Q)mkdir -p $(objtree)/include/asm-um
-       $(Q)ln -fsn $(srctree)/include/asm-$(HEADER_ARCH) include/asm-um/arch
-else
-       $(Q)cd $(srctree)/include/asm-um && ln -fsn ../asm-$(HEADER_ARCH) arch
-endif
-
-$(objtree)/$(ARCH_DIR)/include:
+$(objtree)/$(ARCH_DIR)/include/shared:
        @echo '  MKDIR $@'
        $(Q)mkdir -p $@
 
-$(ARCH_DIR)/include/sysdep: $(objtree)/$(ARCH_DIR)/include
-       @echo '  SYMLINK $@'
-ifneq ($(KBUILD_SRC),)
-       $(Q)ln -fsn $(srctree)/$(ARCH_DIR)/include/sysdep-$(SUBARCH) $(ARCH_DIR)/include/sysdep
-else
-       $(Q)cd $(ARCH_DIR)/include && ln -fsn sysdep-$(SUBARCH) sysdep
-endif
-
-$(ARCH_DIR)/os:
-       @echo '  SYMLINK $@'
-ifneq ($(KBUILD_SRC),)
-       $(Q)ln -fsn $(srctree)/$(ARCH_DIR)/os-$(OS) $(ARCH_DIR)/os
-else
-       $(Q)cd $(ARCH_DIR) && ln -fsn os-$(OS) os
-endif
-
 # Generated files
-define filechk_umlconfig
-       sed 's/ CONFIG/ UML_CONFIG/'
-endef
-
-$(ARCH_DIR)/include/uml-config.h : include/linux/autoconf.h
-       $(call filechk,umlconfig)
 
 $(ARCH_DIR)/sys-$(SUBARCH)/user-offsets.s: FORCE
        $(Q)$(MAKE) $(build)=$(ARCH_DIR)/sys-$(SUBARCH) $@
@@ -205,11 +148,11 @@ define filechk_gen-asm-offsets
          echo ""; )
 endef
 
-$(ARCH_DIR)/include/user_constants.h: $(ARCH_DIR)/sys-$(SUBARCH)/user-offsets.s
+$(ARCH_DIR)/include/shared/user_constants.h: $(ARCH_DIR)/sys-$(SUBARCH)/user-offsets.s
        $(call filechk,gen-asm-offsets)
 
-$(ARCH_DIR)/include/kern_constants.h: $(objtree)/$(ARCH_DIR)/include
+$(ARCH_DIR)/include/shared/kern_constants.h: $(objtree)/$(ARCH_DIR)/include/shared
        @echo '  SYMLINK $@'
-       $(Q)ln -sf ../../../include/asm-um/asm-offsets.h $@
+       $(Q)ln -sf ../../../../include/asm/asm-offsets.h $@
 
-export SUBARCH USER_CFLAGS CFLAGS_NO_HARDENING OS HEADER_ARCH
+export SUBARCH USER_CFLAGS CFLAGS_NO_HARDENING OS HEADER_ARCH DEV_NULL_PATH
index 52859487c95d7d4a2aa9b958144a568b10c99a0f..2c8a598ec14b56221761e7890db42e290e551afe 100644 (file)
@@ -6,3 +6,4 @@
 # To get a definition of F_SETSIG
 USER_CFLAGS += -D_GNU_SOURCE -D_LARGEFILE64_SOURCE
 KBUILD_CFLAGS += -D_LARGEFILE64_SOURCE
+DEV_NULL_PATH = \"/dev/null\"
index d283e7b022a0d8229e3869ad57595178129e0f66..1d9b6ae967b089c780afd713932af0bf42900468 100644 (file)
@@ -62,5 +62,6 @@ obj-$(CONFIG_UML_RANDOM) += random.o
 
 # pcap_user.o must be added explicitly.
 USER_OBJS := fd.o null.o pty.o tty.o xterm.o slip_common.o pcap_user.o vde_user.o
+CFLAGS_null.o = -DDEV_NULL=$(DEV_NULL_PATH)
 
 include arch/um/scripts/Makefile.rules
similarity index 99%
rename from include/asm-um/fixmap.h
rename to arch/um/include/asm/fixmap.h
index 9d2be52b865526586c93a79f1a14d4d7515b820c..69c0252345f10e0ad3061df4d45c325475776c18 100644 (file)
@@ -6,6 +6,7 @@
 #include <asm/kmap_types.h>
 #include <asm/archparam.h>
 #include <asm/page.h>
+#include <linux/threads.h>
 
 /*
  * Here we define all the compile-time 'special' virtual
similarity index 100%
rename from include/asm-um/io.h
rename to arch/um/include/asm/io.h
similarity index 99%
rename from include/asm-um/page.h
rename to arch/um/include/asm/page.h
index a6df1f13d732ddaf7d487fdcb5eabf20a14f6c93..55f28a0bae6d3dd99ee7e23eb01ccb546ba446ef 100644 (file)
@@ -19,7 +19,7 @@
 struct page;
 
 #include <linux/types.h>
-#include <asm/vm-flags.h>
+#include <sysdep/vm-flags.h>
 
 /*
  * These are used to make use of C type-checking..
similarity index 97%
rename from include/asm-um/pgtable.h
rename to arch/um/include/asm/pgtable.h
index 02db81b7b86ea48ffc43ed9405bbe1491959036e..58da2480a7f4229fb164ae81947bfc901de8b27d 100644 (file)
@@ -47,6 +47,7 @@ extern unsigned long end_iomem;
 
 #define VMALLOC_OFFSET (__va_space)
 #define VMALLOC_START ((end_iomem + VMALLOC_OFFSET) & ~(VMALLOC_OFFSET-1))
+#define PKMAP_BASE ((FIXADDR_START - LAST_PKMAP * PAGE_SIZE) & PMD_MASK)
 #ifdef CONFIG_HIGHMEM
 # define VMALLOC_END   (PKMAP_BASE-2*PAGE_SIZE)
 #else
@@ -355,4 +356,11 @@ extern pte_t *virt_to_pte(struct mm_struct *mm, unsigned long addr);
 
 #include <asm-generic/pgtable.h>
 
+/* Clear a kernel PTE and flush it from the TLB */
+#define kpte_clear_flush(ptep, vaddr)          \
+do {                                           \
+       pte_clear(&init_mm, (vaddr), (ptep));   \
+       __flush_tlb_one((vaddr));               \
+} while (0)
+
 #endif
similarity index 97%
rename from include/asm-um/ptrace-generic.h
rename to arch/um/include/asm/ptrace-generic.h
index 315749705ea1b91fccf261ba1161eb785cff9701..6c8899013c92cbf45eaa1039142179374e8136ba 100644 (file)
@@ -8,7 +8,7 @@
 
 #ifndef __ASSEMBLY__
 
-#include "asm/arch/ptrace-abi.h"
+#include <asm/ptrace-abi.h>
 #include <asm/user.h>
 #include "sysdep/ptrace.h"
 
similarity index 79%
rename from include/asm-um/system-generic.h
rename to arch/um/include/asm/system.h
index 5bcfa35e7a22c79eed604df3697ba7c89baeb43d..753346e2cdfd64d5d472f3388014952f5d0ca4ff 100644 (file)
@@ -1,19 +1,7 @@
 #ifndef __UM_SYSTEM_GENERIC_H
 #define __UM_SYSTEM_GENERIC_H
 
-#include "asm/arch/system.h"
-
-#undef switch_to
-#undef local_irq_save
-#undef local_irq_restore
-#undef local_irq_disable
-#undef local_irq_enable
-#undef local_save_flags
-#undef local_irq_restore
-#undef local_irq_enable
-#undef local_irq_disable
-#undef local_irq_save
-#undef irqs_disabled
+#include "sysdep/system.h"
 
 extern void *switch_to(void *prev, void *next, void *last);
 
similarity index 98%
rename from arch/um/include/as-layout.h
rename to arch/um/include/shared/as-layout.h
index 58e852dfb0ce95ff1e6877eaa549c2200b50e620..a92b678503cf78b0d760a436ca9b54440f3aac5c 100644 (file)
@@ -6,7 +6,6 @@
 #ifndef __START_H__
 #define __START_H__
 
-#include "uml-config.h"
 #include "kern_constants.h"
 
 /*
similarity index 80%
rename from arch/um/include/common-offsets.h
rename to arch/um/include/shared/common-offsets.h
index b54bd35585c2d7c306dd6e6def01c2d958dc9d2b..72009c7e3210a036cbbef0b688bd08718eacbb59 100644 (file)
@@ -39,3 +39,16 @@ DEFINE(UM_HZ, HZ);
 DEFINE(UM_USEC_PER_SEC, USEC_PER_SEC);
 DEFINE(UM_NSEC_PER_SEC, NSEC_PER_SEC);
 DEFINE(UM_NSEC_PER_USEC, NSEC_PER_USEC);
+
+#ifdef CONFIG_PRINTK
+DEFINE(UML_CONFIG_PRINTK, CONFIG_PRINTK);
+#endif
+#ifdef CONFIG_NO_HZ
+DEFINE(UML_CONFIG_NO_HZ, CONFIG_NO_HZ);
+#endif
+#ifdef CONFIG_UML_X86
+DEFINE(UML_CONFIG_UML_X86, CONFIG_UML_X86);
+#endif
+#ifdef CONFIG_64BIT
+DEFINE(UML_CONFIG_64BIT, CONFIG_64BIT);
+#endif
similarity index 95%
rename from include/asm-um/ldt.h
rename to arch/um/include/shared/ldt.h
index 52af512f5e7dcf272a73de968b709f900218e98d..a7f999a58774d636f5003f08910f10a5f4dcd40f 100644 (file)
@@ -9,7 +9,7 @@
 #define __ASM_LDT_H
 
 #include <linux/mutex.h>
-#include "asm/host_ldt.h"
+#include <sysdep/host_ldt.h>
 
 extern void ldt_host_info(void);
 
similarity index 99%
rename from arch/um/include/os.h
rename to arch/um/include/shared/os.h
index db5be46e3e186677c8f16c93f585e82413d7740f..cd40fddcf99df8fcf4a583d5c8fe05314d27077c 100644 (file)
@@ -11,7 +11,6 @@
 #include "longjmp.h"
 #include "mm_id.h"
 #include "sysdep/tls.h"
-#include "../os/include/file.h"
 
 #define CATCH_EINTR(expr) while ((errno = 0, ((expr) < 0)) && (errno == EINTR))
 
similarity index 91%
rename from arch/um/include/um_mmu.h
rename to arch/um/include/shared/um_mmu.h
index f575ff91f2a01796951c90090542b18344e6998b..b1a7e47d10277689535add4b4027fe092655f2d0 100644 (file)
@@ -6,9 +6,8 @@
 #ifndef __ARCH_UM_MMU_H
 #define __ARCH_UM_MMU_H
 
-#include "uml-config.h"
 #include "mm_id.h"
-#include "asm/ldt.h"
+#include "ldt.h"
 
 typedef struct mm_context {
        struct mm_id id;
similarity index 97%
rename from arch/um/include/user.h
rename to arch/um/include/shared/user.h
index 1723fac6f40d1eb45329133e4d9146666769076a..293f7c794faa46a38c4767125d5d37201c72c675 100644 (file)
@@ -6,7 +6,7 @@
 #ifndef __USER_H__
 #define __USER_H__
 
-#include "uml-config.h"
+#include "kern_constants.h"
 
 /*
  * The usual definition - copied here because the kernel provides its own,
diff --git a/arch/um/include/sigcontext.h b/arch/um/include/sigcontext.h
deleted file mode 100644 (file)
index 59816ca..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-/* 
- * Copyright (C) 2001, 2002 Jeff Dike (jdike@karaya.com)
- * Licensed under the GPL
- */
-
-#ifndef __UML_SIGCONTEXT_H__
-#define __UML_SIGCONTEXT_H__
-
-#include "sysdep/sigcontext.h"
-
-extern int sc_size(void *data);
-extern void sc_to_sc(void *to_ptr, void *from_ptr);
-
-#endif
-
-/*
- * Overrides for Emacs so that we follow Linus's tabbing style.
- * Emacs will notice this stuff at the end of the file and automatically
- * adjust the settings for this buffer only.  This must remain at the end
- * of the file.
- * ---------------------------------------------------------------------------
- * Local variables:
- * c-file-style: "linux"
- * End:
- */
index 598711c62c82cbb59ce79193eaa67e70d45b48e3..fda30d21fb90628cec430c151f9e3993df74fc5c 100644 (file)
@@ -15,6 +15,7 @@
 #include "mem_user.h"
 #include "skas.h"
 #include "os.h"
+#include "internal.h"
 
 void flush_thread(void)
 {
diff --git a/arch/um/kernel/internal.h b/arch/um/kernel/internal.h
new file mode 100644 (file)
index 0000000..3bda43c
--- /dev/null
@@ -0,0 +1 @@
+extern long um_execve(char *file, char __user *__user *argv, char __user *__user *env);
index b0fce720c4d08378afba4f642ec97b712ca482c3..b5c094c4ade4020f379856fe9117dce8124be57b 100644 (file)
@@ -11,7 +11,7 @@
 #include <asm/unistd.h>
 #include "frame_kern.h"
 #include "kern_util.h"
-#include "sigcontext.h"
+#include <sysdep/sigcontext.h>
 
 EXPORT_SYMBOL(block_signals);
 EXPORT_SYMBOL(unblock_signals);
index 128ee85bc8d96b78522fb7f1043a913ec0e9d269..c4df705b835937f9256cafe43fcd92c9830eba59 100644 (file)
@@ -12,6 +12,7 @@
 #include "asm/mman.h"
 #include "asm/uaccess.h"
 #include "asm/unistd.h"
+#include "internal.h"
 
 long sys_fork(void)
 {
diff --git a/arch/um/os-Linux/include/file.h b/arch/um/os-Linux/include/file.h
deleted file mode 100644 (file)
index fe71be2..0000000
+++ /dev/null
@@ -1,11 +0,0 @@
-/* 
- * Copyright (C) 2002 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com)
- * Licensed under the GPL
- */
-
-#ifndef __OS_FILE_H__
-#define __OS_FILE_H__
-
-#define DEV_NULL "/dev/null"
-
-#endif
index 484e68f9f7ae7362a0e36b87505ed9048f7302f2..d261f170d120862010cbea1facfe6d4bcc8ab69d 100644 (file)
@@ -20,7 +20,6 @@
 #include "user.h"
 #include "sysdep/ptrace.h"
 #include "sysdep/stub.h"
-#include "uml-config.h"
 
 extern unsigned long batch_syscall_stub, __syscall_stub_start;
 
similarity index 77%
rename from include/asm-um/archparam-i386.h
rename to arch/um/sys-i386/asm/archparam.h
index 49e89b8d7e588354d47a896a824f4e25c3970e7c..93fd723344e54fef2cc64c12b10023cc3538d61f 100644 (file)
@@ -6,11 +6,11 @@
 #ifndef __UM_ARCHPARAM_I386_H
 #define __UM_ARCHPARAM_I386_H
 
-/********* Nothing for asm-um/hardirq.h **********/
-
-/********* Nothing for asm-um/hw_irq.h **********/
-
-/********* Nothing for asm-um/string.h **********/
+#ifdef CONFIG_X86_PAE
+#define LAST_PKMAP 512
+#else
+#define LAST_PKMAP 1024
+#endif
 
 #endif
 
similarity index 97%
rename from include/asm-um/processor-i386.h
rename to arch/um/sys-i386/asm/processor.h
index a2b7fe13fe1e48179b1fd5f0eeff8315dcb15b0d..82a9061ab5be641fb72763e89efe96c1f346f08e 100644 (file)
@@ -7,7 +7,7 @@
 #define __UM_PROCESSOR_I386_H
 
 #include "linux/string.h"
-#include "asm/host_ldt.h"
+#include <sysdep/host_ldt.h>
 #include "asm/segment.h"
 
 extern int host_has_cmov;
@@ -48,7 +48,7 @@ static inline void arch_copy_thread(struct arch_thread *from,
         memcpy(&to->tls_array, &from->tls_array, sizeof(from->tls_array));
 }
 
-#include "asm/arch/user.h"
+#include <asm/user.h>
 
 /* REP NOP (PAUSE) is a good thing to insert into busy-wait loops. */
 static inline void rep_nop(void)
similarity index 93%
rename from include/asm-um/ptrace-i386.h
rename to arch/um/sys-i386/asm/ptrace.h
index b2d24c5ea2c3237ed1a573666ced4f7205004d0d..0273e4d09af7b65e47c5dab30936f5d1acd69643 100644 (file)
@@ -10,8 +10,6 @@
 
 #include "linux/compiler.h"
 #include "asm/ptrace-generic.h"
-#include <asm/user.h>
-#include "sysdep/ptrace.h"
 
 #define PT_REGS_EAX(r) UPT_EAX(&(r)->regs)
 #define PT_REGS_EBX(r) UPT_EBX(&(r)->regs)
@@ -34,8 +32,6 @@
 #define PT_REGS_SYSCALL_RET(r) PT_REGS_EAX(r)
 #define PT_FIX_EXEC_STACK(sp) do ; while(0)
 
-/* Cope with a conditional i386 definition. */
-#undef profile_pc
 #define profile_pc(regs) PT_REGS_IP(regs)
 
 #define user_mode(r) UPT_IS_USER(&(r)->regs)
similarity index 97%
rename from include/asm-um/host_ldt-i386.h
rename to arch/um/sys-i386/shared/sysdep/host_ldt.h
index b27cb0a9dd30a016f2f3dee36111454530262991..0953cc4df65284bc61745abb2fdb487935aef03b 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef __ASM_HOST_LDT_I386_H
 #define __ASM_HOST_LDT_I386_H
 
-#include "asm/arch/ldt.h"
+#include <asm/ldt.h>
 
 /*
  * macros stolen from include/asm-i386/desc.h
similarity index 99%
rename from arch/um/include/sysdep-i386/ptrace.h
rename to arch/um/sys-i386/shared/sysdep/ptrace.h
index 11c08969d1342b8fce90a27233b87b979f57218a..d50e62e070707ce6ca88b9e8f450ac5eec61d98e 100644 (file)
@@ -6,7 +6,6 @@
 #ifndef __SYSDEP_I386_PTRACE_H
 #define __SYSDEP_I386_PTRACE_H
 
-#include "uml-config.h"
 #include "user_constants.h"
 #include "sysdep/faultinfo.h"
 
similarity index 98%
rename from arch/um/include/sysdep-i386/stub.h
rename to arch/um/sys-i386/shared/sysdep/stub.h
index 8c097b87fca7be4b3ea209feff41aa4fa2adc3d6..977dedd9221bf44cd97a0611febb727486f823a3 100644 (file)
@@ -12,7 +12,6 @@
 #include "as-layout.h"
 #include "stub-data.h"
 #include "kern_constants.h"
-#include "uml-config.h"
 
 extern void stub_segv_handler(int sig);
 extern void stub_clone_handler(void);
diff --git a/arch/um/sys-i386/shared/sysdep/system.h b/arch/um/sys-i386/shared/sysdep/system.h
new file mode 100644 (file)
index 0000000..d1b93c4
--- /dev/null
@@ -0,0 +1,132 @@
+#ifndef _ASM_X86_SYSTEM_H_
+#define _ASM_X86_SYSTEM_H_
+
+#include <asm/asm.h>
+#include <asm/segment.h>
+#include <asm/cpufeature.h>
+#include <asm/cmpxchg.h>
+#include <asm/nops.h>
+
+#include <linux/kernel.h>
+#include <linux/irqflags.h>
+
+/* entries in ARCH_DLINFO: */
+#ifdef CONFIG_IA32_EMULATION
+# define AT_VECTOR_SIZE_ARCH 2
+#else
+# define AT_VECTOR_SIZE_ARCH 1
+#endif
+
+extern unsigned long arch_align_stack(unsigned long sp);
+
+void default_idle(void);
+
+/*
+ * Force strict CPU ordering.
+ * And yes, this is required on UP too when we're talking
+ * to devices.
+ */
+#ifdef CONFIG_X86_32
+/*
+ * Some non-Intel clones support out of order store. wmb() ceases to be a
+ * nop for these.
+ */
+#define mb() alternative("lock; addl $0,0(%%esp)", "mfence", X86_FEATURE_XMM2)
+#define rmb() alternative("lock; addl $0,0(%%esp)", "lfence", X86_FEATURE_XMM2)
+#define wmb() alternative("lock; addl $0,0(%%esp)", "sfence", X86_FEATURE_XMM)
+#else
+#define mb()   asm volatile("mfence":::"memory")
+#define rmb()  asm volatile("lfence":::"memory")
+#define wmb()  asm volatile("sfence" ::: "memory")
+#endif
+
+/**
+ * read_barrier_depends - Flush all pending reads that subsequents reads
+ * depend on.
+ *
+ * No data-dependent reads from memory-like regions are ever reordered
+ * over this barrier.  All reads preceding this primitive are guaranteed
+ * to access memory (but not necessarily other CPUs' caches) before any
+ * reads following this primitive that depend on the data return by
+ * any of the preceding reads.  This primitive is much lighter weight than
+ * rmb() on most CPUs, and is never heavier weight than is
+ * rmb().
+ *
+ * These ordering constraints are respected by both the local CPU
+ * and the compiler.
+ *
+ * Ordering is not guaranteed by anything other than these primitives,
+ * not even by data dependencies.  See the documentation for
+ * memory_barrier() for examples and URLs to more information.
+ *
+ * For example, the following code would force ordering (the initial
+ * value of "a" is zero, "b" is one, and "p" is "&a"):
+ *
+ * <programlisting>
+ *     CPU 0                           CPU 1
+ *
+ *     b = 2;
+ *     memory_barrier();
+ *     p = &b;                         q = p;
+ *                                     read_barrier_depends();
+ *                                     d = *q;
+ * </programlisting>
+ *
+ * because the read of "*q" depends on the read of "p" and these
+ * two reads are separated by a read_barrier_depends().  However,
+ * the following code, with the same initial values for "a" and "b":
+ *
+ * <programlisting>
+ *     CPU 0                           CPU 1
+ *
+ *     a = 2;
+ *     memory_barrier();
+ *     b = 3;                          y = b;
+ *                                     read_barrier_depends();
+ *                                     x = a;
+ * </programlisting>
+ *
+ * does not enforce ordering, since there is no data dependency between
+ * the read of "a" and the read of "b".  Therefore, on some CPUs, such
+ * as Alpha, "y" could be set to 3 and "x" to 0.  Use rmb()
+ * in cases like this where there are no data dependencies.
+ **/
+
+#define read_barrier_depends() do { } while (0)
+
+#ifdef CONFIG_SMP
+#define smp_mb()       mb()
+#ifdef CONFIG_X86_PPRO_FENCE
+# define smp_rmb()     rmb()
+#else
+# define smp_rmb()     barrier()
+#endif
+#ifdef CONFIG_X86_OOSTORE
+# define smp_wmb()     wmb()
+#else
+# define smp_wmb()     barrier()
+#endif
+#define smp_read_barrier_depends()     read_barrier_depends()
+#define set_mb(var, value) do { (void)xchg(&var, value); } while (0)
+#else
+#define smp_mb()       barrier()
+#define smp_rmb()      barrier()
+#define smp_wmb()      barrier()
+#define smp_read_barrier_depends()     do { } while (0)
+#define set_mb(var, value) do { var = value; barrier(); } while (0)
+#endif
+
+/*
+ * Stop RDTSC speculation. This is needed when you need to use RDTSC
+ * (or get_cycles or vread that possibly accesses the TSC) in a defined
+ * code region.
+ *
+ * (Could use an alternative three way for this if there was one.)
+ */
+static inline void rdtsc_barrier(void)
+{
+       alternative(ASM_NOP3, "mfence", X86_FEATURE_MFENCE_RDTSC);
+       alternative(ASM_NOP3, "lfence", X86_FEATURE_LFENCE_RDTSC);
+}
+
+#endif
similarity index 97%
rename from arch/um/include/sysdep-i386/tls.h
rename to arch/um/sys-i386/shared/sysdep/tls.h
index 918fd3c5ff9cad3ff4854fb47010386bf20f3bc3..34550755b2a1621939f597f2b86c4bfa77de0551 100644 (file)
@@ -21,7 +21,7 @@ typedef struct um_dup_user_desc {
 
 # else /* __KERNEL__ */
 
-#  include <asm/ldt.h>
+#  include <ldt.h>
 typedef struct user_desc user_desc_t;
 
 # endif /* __KERNEL__ */
index 7699e89f660fd42701736ce1bfe79e4d6b2d0ddc..c41b04bf5fa005399183176935a683dbfe92d3ce 100644 (file)
@@ -1,4 +1,3 @@
-#include "uml-config.h"
 #include "as-layout.h"
 
        .globl syscall_stub
index e2d14268441201d87f09c1adfb27f9a14233f24e..857ca0b3bdef136a78b7eb59a00b2de4a14b6aed 100644 (file)
@@ -6,6 +6,7 @@
 #include "linux/sched.h"
 #include "linux/shm.h"
 #include "linux/ipc.h"
+#include "linux/syscalls.h"
 #include "asm/mman.h"
 #include "asm/uaccess.h"
 #include "asm/unistd.h"
similarity index 97%
rename from include/asm-um/processor-x86_64.h
rename to arch/um/sys-x86_64/asm/processor.h
index e50933175e9105206e207afcdc61ec46d0d49463..875a26a62614a9ae7f1788cc6549ebafc99aca07 100644 (file)
@@ -40,7 +40,7 @@ static inline void arch_copy_thread(struct arch_thread *from,
        to->fs = from->fs;
 }
 
-#include "asm/arch/user.h"
+#include <asm/user.h>
 
 #define current_text_addr() \
        ({ void *pc; __asm__("movq $1f,%0\n1:":"=g" (pc)); pc; })
similarity index 85%
rename from include/asm-um/ptrace-x86_64.h
rename to arch/um/sys-x86_64/asm/ptrace.h
index 4c475350dcf02a545102042493508d9aa70686ba..83d8c473b905886b62585cf43839473a12fb791f 100644 (file)
@@ -9,23 +9,12 @@
 
 #include "linux/compiler.h"
 #include "asm/errno.h"
-#include "asm/host_ldt.h"
 
 #define __FRAME_OFFSETS /* Needed to get the R* macros */
 #include "asm/ptrace-generic.h"
 
 #define HOST_AUDIT_ARCH AUDIT_ARCH_X86_64
 
-/* Also defined in sysdep/ptrace.h, so may already be defined. */
-#ifndef FS_BASE
-#define FS_BASE (21 * sizeof(unsigned long))
-#define GS_BASE (22 * sizeof(unsigned long))
-#define DS (23 * sizeof(unsigned long))
-#define ES (24 * sizeof(unsigned long))
-#define FS (25 * sizeof(unsigned long))
-#define GS (26 * sizeof(unsigned long))
-#endif
-
 #define PT_REGS_RBX(r) UPT_RBX(&(r)->regs)
 #define PT_REGS_RCX(r) UPT_RCX(&(r)->regs)
 #define PT_REGS_RDX(r) UPT_RDX(&(r)->regs)
@@ -64,6 +53,8 @@
 
 #define profile_pc(regs) PT_REGS_IP(regs)
 
+struct user_desc;
+
 static inline int ptrace_get_thread_area(struct task_struct *child, int idx,
                                          struct user_desc __user *user_desc)
 {
similarity index 97%
rename from include/asm-um/host_ldt-x86_64.h
rename to arch/um/sys-x86_64/shared/sysdep/host_ldt.h
index 74a63f7d9a90b10a8c0571ac8c18abff717e4337..e8b1be1e154f44a6437b5b78d1c7fe120784e7e2 100644 (file)
@@ -1,7 +1,7 @@
 #ifndef __ASM_HOST_LDT_X86_64_H
 #define __ASM_HOST_LDT_X86_64_H
 
-#include "asm/arch/ldt.h"
+#include <asm/ldt.h>
 
 /*
  * macros stolen from include/asm-x86_64/desc.h
similarity index 99%
rename from arch/um/include/sysdep-x86_64/ptrace.h
rename to arch/um/sys-x86_64/shared/sysdep/ptrace.h
index 9ea44d111f335c5184fdd8924cd72a5fc0b52ac2..fdba5457947a0cc7f16cfd34d30a63bb05120e0d 100644 (file)
@@ -8,7 +8,6 @@
 #ifndef __SYSDEP_X86_64_PTRACE_H
 #define __SYSDEP_X86_64_PTRACE_H
 
-#include "uml-config.h"
 #include "user_constants.h"
 #include "sysdep/faultinfo.h"
 
similarity index 98%
rename from arch/um/include/sysdep-x86_64/stub.h
rename to arch/um/sys-x86_64/shared/sysdep/stub.h
index 655f9c2de3ac0b127a6e57729b5d5ab3de7b9540..3432aa249970c54880fbae342d5c9b1c28cc619e 100644 (file)
@@ -12,7 +12,6 @@
 #include "as-layout.h"
 #include "stub-data.h"
 #include "kern_constants.h"
-#include "uml-config.h"
 
 extern void stub_segv_handler(int sig);
 extern void stub_clone_handler(void);
diff --git a/arch/um/sys-x86_64/shared/sysdep/system.h b/arch/um/sys-x86_64/shared/sysdep/system.h
new file mode 100644 (file)
index 0000000..d1b93c4
--- /dev/null
@@ -0,0 +1,132 @@
+#ifndef _ASM_X86_SYSTEM_H_
+#define _ASM_X86_SYSTEM_H_
+
+#include <asm/asm.h>
+#include <asm/segment.h>
+#include <asm/cpufeature.h>
+#include <asm/cmpxchg.h>
+#include <asm/nops.h>
+
+#include <linux/kernel.h>
+#include <linux/irqflags.h>
+
+/* entries in ARCH_DLINFO: */
+#ifdef CONFIG_IA32_EMULATION
+# define AT_VECTOR_SIZE_ARCH 2
+#else
+# define AT_VECTOR_SIZE_ARCH 1
+#endif
+
+extern unsigned long arch_align_stack(unsigned long sp);
+
+void default_idle(void);
+
+/*
+ * Force strict CPU ordering.
+ * And yes, this is required on UP too when we're talking
+ * to devices.
+ */
+#ifdef CONFIG_X86_32
+/*
+ * Some non-Intel clones support out of order store. wmb() ceases to be a
+ * nop for these.
+ */
+#define mb() alternative("lock; addl $0,0(%%esp)", "mfence", X86_FEATURE_XMM2)
+#define rmb() alternative("lock; addl $0,0(%%esp)", "lfence", X86_FEATURE_XMM2)
+#define wmb() alternative("lock; addl $0,0(%%esp)", "sfence", X86_FEATURE_XMM)
+#else
+#define mb()   asm volatile("mfence":::"memory")
+#define rmb()  asm volatile("lfence":::"memory")
+#define wmb()  asm volatile("sfence" ::: "memory")
+#endif
+
+/**
+ * read_barrier_depends - Flush all pending reads that subsequents reads
+ * depend on.
+ *
+ * No data-dependent reads from memory-like regions are ever reordered
+ * over this barrier.  All reads preceding this primitive are guaranteed
+ * to access memory (but not necessarily other CPUs' caches) before any
+ * reads following this primitive that depend on the data return by
+ * any of the preceding reads.  This primitive is much lighter weight than
+ * rmb() on most CPUs, and is never heavier weight than is
+ * rmb().
+ *
+ * These ordering constraints are respected by both the local CPU
+ * and the compiler.
+ *
+ * Ordering is not guaranteed by anything other than these primitives,
+ * not even by data dependencies.  See the documentation for
+ * memory_barrier() for examples and URLs to more information.
+ *
+ * For example, the following code would force ordering (the initial
+ * value of "a" is zero, "b" is one, and "p" is "&a"):
+ *
+ * <programlisting>
+ *     CPU 0                           CPU 1
+ *
+ *     b = 2;
+ *     memory_barrier();
+ *     p = &b;                         q = p;
+ *                                     read_barrier_depends();
+ *                                     d = *q;
+ * </programlisting>
+ *
+ * because the read of "*q" depends on the read of "p" and these
+ * two reads are separated by a read_barrier_depends().  However,
+ * the following code, with the same initial values for "a" and "b":
+ *
+ * <programlisting>
+ *     CPU 0                           CPU 1
+ *
+ *     a = 2;
+ *     memory_barrier();
+ *     b = 3;                          y = b;
+ *                                     read_barrier_depends();
+ *                                     x = a;
+ * </programlisting>
+ *
+ * does not enforce ordering, since there is no data dependency between
+ * the read of "a" and the read of "b".  Therefore, on some CPUs, such
+ * as Alpha, "y" could be set to 3 and "x" to 0.  Use rmb()
+ * in cases like this where there are no data dependencies.
+ **/
+
+#define read_barrier_depends() do { } while (0)
+
+#ifdef CONFIG_SMP
+#define smp_mb()       mb()
+#ifdef CONFIG_X86_PPRO_FENCE
+# define smp_rmb()     rmb()
+#else
+# define smp_rmb()     barrier()
+#endif
+#ifdef CONFIG_X86_OOSTORE
+# define smp_wmb()     wmb()
+#else
+# define smp_wmb()     barrier()
+#endif
+#define smp_read_barrier_depends()     read_barrier_depends()
+#define set_mb(var, value) do { (void)xchg(&var, value); } while (0)
+#else
+#define smp_mb()       barrier()
+#define smp_rmb()      barrier()
+#define smp_wmb()      barrier()
+#define smp_read_barrier_depends()     do { } while (0)
+#define set_mb(var, value) do { var = value; barrier(); } while (0)
+#endif
+
+/*
+ * Stop RDTSC speculation. This is needed when you need to use RDTSC
+ * (or get_cycles or vread that possibly accesses the TSC) in a defined
+ * code region.
+ *
+ * (Could use an alternative three way for this if there was one.)
+ */
+static inline void rdtsc_barrier(void)
+{
+       alternative(ASM_NOP3, "mfence", X86_FEATURE_MFENCE_RDTSC);
+       alternative(ASM_NOP3, "lfence", X86_FEATURE_LFENCE_RDTSC);
+}
+
+#endif
similarity index 96%
rename from arch/um/include/sysdep-x86_64/tls.h
rename to arch/um/sys-x86_64/shared/sysdep/tls.h
index 35f19f25bd3b749240ba5a7591fb55023cc666a1..18c000d0357a3fb465605cdd881988fff9d28c74 100644 (file)
@@ -22,7 +22,7 @@ typedef struct um_dup_user_desc {
 
 # else /* __KERNEL__ */
 
-#  include <asm/ldt.h>
+#  include <ldt.h>
 typedef struct user_desc user_desc_t;
 
 # endif /* __KERNEL__ */
index 5687687631554dabc7e61719a4a900d8d5f691c1..6d9edf9fabce15d4dac536ae8ce18e70b301822e 100644 (file)
@@ -1,4 +1,3 @@
-#include "uml-config.h"
 #include "as-layout.h"
 
        .globl syscall_stub
index 32f5fbe2d0d2fe2aca4a7f3b5eeec80b3eb6d87d..dd21d69715e62abc7bacc3fde820466f9320cf44 100644 (file)
 #define stub_rt_sigreturn sys_rt_sigreturn
 
 #define __SYSCALL(nr, sym) extern asmlinkage void sym(void) ;
-#undef ASM_X86__UNISTD_64_H
-#include <asm-x86/unistd_64.h>
+#undef _ASM_X86_UNISTD_64_H
+#include "../../x86/include/asm/unistd_64.h"
 
 #undef __SYSCALL
 #define __SYSCALL(nr, sym) [ nr ] = sym,
-#undef ASM_X86__UNISTD_64_H
+#undef _ASM_X86_UNISTD_64_H
 
 typedef void (*sys_call_ptr_t)(void);
 
@@ -64,7 +64,7 @@ extern void sys_ni_syscall(void);
  */
 
 sys_call_ptr_t sys_call_table[] __cacheline_aligned = {
-#include <asm-x86/unistd_64.h>
+#include "../../x86/include/asm/unistd_64.h"
 };
 
 int syscall_table_size = sizeof(sys_call_table);
index f5631da585b69ac1722891bc0bee1e63a1ec652c..d1a47adb5aec0b14cfd6b52297be80f87fbf0682 100644 (file)
@@ -110,16 +110,16 @@ KBUILD_CFLAGS += $(call cc-option,-mno-sse -mno-mmx -mno-sse2 -mno-3dnow,)
 mcore-y  := arch/x86/mach-default/
 
 # Voyager subarch support
-mflags-$(CONFIG_X86_VOYAGER)   := -Iinclude/asm-x86/mach-voyager
+mflags-$(CONFIG_X86_VOYAGER)   := -Iarch/x86/include/asm/mach-voyager
 mcore-$(CONFIG_X86_VOYAGER)    := arch/x86/mach-voyager/
 
 # generic subarchitecture
-mflags-$(CONFIG_X86_GENERICARCH):= -Iinclude/asm-x86/mach-generic
+mflags-$(CONFIG_X86_GENERICARCH):= -Iarch/x86/include/asm/mach-generic
 fcore-$(CONFIG_X86_GENERICARCH)        += arch/x86/mach-generic/
 mcore-$(CONFIG_X86_GENERICARCH)        := arch/x86/mach-default/
 
 # default subarch .h files
-mflags-y += -Iinclude/asm-x86/mach-default
+mflags-y += -Iarch/x86/include/asm/mach-default
 
 # 64 bit does not support subarch support - clear sub arch variables
 fcore-$(CONFIG_X86_64)  :=
index 5780d361105bf4863328243386ed69ecdbc89889..da062216948a6951990f354fa11ee9125b865fe7 100644 (file)
@@ -16,7 +16,7 @@
  */
 #undef CONFIG_PARAVIRT
 #ifdef CONFIG_X86_32
-#define ASM_X86__DESC_H 1
+#define _ASM_X86_DESC_H 1
 #endif
 
 #ifdef CONFIG_X86_64
similarity index 95%
rename from include/asm-x86/a.out-core.h
rename to arch/x86/include/asm/a.out-core.h
index f5705761a37b14509c5603e79c69292fdb4adb66..37822206083e2684026984d69ee8732a9b74118a 100644 (file)
@@ -9,8 +9,8 @@
  * 2 of the Licence, or (at your option) any later version.
  */
 
-#ifndef ASM_X86__A_OUT_CORE_H
-#define ASM_X86__A_OUT_CORE_H
+#ifndef _ASM_X86_A_OUT_CORE_H
+#define _ASM_X86_A_OUT_CORE_H
 
 #ifdef __KERNEL__
 #ifdef CONFIG_X86_32
@@ -70,4 +70,4 @@ static inline void aout_dump_thread(struct pt_regs *regs, struct user *dump)
 
 #endif /* CONFIG_X86_32 */
 #endif /* __KERNEL__ */
-#endif /* ASM_X86__A_OUT_CORE_H */
+#endif /* _ASM_X86_A_OUT_CORE_H */
similarity index 88%
rename from include/asm-x86/a.out.h
rename to arch/x86/include/asm/a.out.h
index 0948748bc69c1dd8f694c34878551868e01a3da7..4684f97a5bbd1b1edce881a88e75393b580a2cd1 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef ASM_X86__A_OUT_H
-#define ASM_X86__A_OUT_H
+#ifndef _ASM_X86_A_OUT_H
+#define _ASM_X86_A_OUT_H
 
 struct exec
 {
@@ -17,4 +17,4 @@ struct exec
 #define N_DRSIZE(a)    ((a).a_drsize)
 #define N_SYMSIZE(a)   ((a).a_syms)
 
-#endif /* ASM_X86__A_OUT_H */
+#endif /* _ASM_X86_A_OUT_H */
similarity index 98%
rename from include/asm-x86/acpi.h
rename to arch/x86/include/asm/acpi.h
index 392e17336be1dede3964b6e61ca4cdf568b258fd..8d676d8ecde93d2bd0f76f5891ea5982970aae8a 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef ASM_X86__ACPI_H
-#define ASM_X86__ACPI_H
+#ifndef _ASM_X86_ACPI_H
+#define _ASM_X86_ACPI_H
 
 /*
  *  Copyright (C) 2001 Paul Diefenbaugh <paul.s.diefenbaugh@intel.com>
@@ -175,4 +175,4 @@ static inline void acpi_fake_nodes(const struct bootnode *fake_nodes,
 
 #define acpi_unlazy_tlb(x)     leave_mm(x)
 
-#endif /* ASM_X86__ACPI_H */
+#endif /* _ASM_X86_ACPI_H */
similarity index 93%
rename from include/asm-x86/agp.h
rename to arch/x86/include/asm/agp.h
index 3617fd4fcdf9faa1f110055cd33f607e98662c76..9825cd64c9b6e7126432e14c0ee6aebd804a799c 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef ASM_X86__AGP_H
-#define ASM_X86__AGP_H
+#ifndef _ASM_X86_AGP_H
+#define _ASM_X86_AGP_H
 
 #include <asm/pgtable.h>
 #include <asm/cacheflush.h>
@@ -32,4 +32,4 @@
 #define free_gatt_pages(table, order)  \
        free_pages((unsigned long)(table), (order))
 
-#endif /* ASM_X86__AGP_H */
+#endif /* _ASM_X86_AGP_H */
similarity index 98%
rename from include/asm-x86/alternative.h
rename to arch/x86/include/asm/alternative.h
index 22d3c9862bf3b3a0967df0c9c2f2b7038d6e1ba3..f6aa18eadf71717d9e86c53ac3719776fa035969 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef ASM_X86__ALTERNATIVE_H
-#define ASM_X86__ALTERNATIVE_H
+#ifndef _ASM_X86_ALTERNATIVE_H
+#define _ASM_X86_ALTERNATIVE_H
 
 #include <linux/types.h>
 #include <linux/stddef.h>
@@ -180,4 +180,4 @@ extern void add_nops(void *insns, unsigned int len);
 extern void *text_poke(void *addr, const void *opcode, size_t len);
 extern void *text_poke_early(void *addr, const void *opcode, size_t len);
 
-#endif /* ASM_X86__ALTERNATIVE_H */
+#endif /* _ASM_X86_ALTERNATIVE_H */
similarity index 92%
rename from include/asm-x86/amd_iommu.h
rename to arch/x86/include/asm/amd_iommu.h
index 041d0db7da272d42abe5d5659f38da6fe2b0e590..f712344329bc7a6929a38f8e0e968bd1166e4c9e 100644 (file)
@@ -17,8 +17,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
-#ifndef ASM_X86__AMD_IOMMU_H
-#define ASM_X86__AMD_IOMMU_H
+#ifndef _ASM_X86_AMD_IOMMU_H
+#define _ASM_X86_AMD_IOMMU_H
 
 #include <linux/irqreturn.h>
 
@@ -32,4 +32,4 @@ static inline int amd_iommu_init(void) { return -ENODEV; }
 static inline void amd_iommu_detect(void) { }
 #endif
 
-#endif /* ASM_X86__AMD_IOMMU_H */
+#endif /* _ASM_X86_AMD_IOMMU_H */
similarity index 99%
rename from include/asm-x86/amd_iommu_types.h
rename to arch/x86/include/asm/amd_iommu_types.h
index b3085869a17b04aaa686e7360c2c424d0d875969..1a30c0440c6bb4c907b400313c7bbd1865bb9298 100644 (file)
@@ -17,8 +17,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
-#ifndef ASM_X86__AMD_IOMMU_TYPES_H
-#define ASM_X86__AMD_IOMMU_TYPES_H
+#ifndef _ASM_X86_AMD_IOMMU_TYPES_H
+#define _ASM_X86_AMD_IOMMU_TYPES_H
 
 #include <linux/types.h>
 #include <linux/list.h>
@@ -401,4 +401,4 @@ static inline u16 calc_devid(u8 bus, u8 devfn)
        return (((u16)bus) << 8) | devfn;
 }
 
-#endif /* ASM_X86__AMD_IOMMU_TYPES_H */
+#endif /* _ASM_X86_AMD_IOMMU_TYPES_H */
similarity index 98%
rename from include/asm-x86/apic.h
rename to arch/x86/include/asm/apic.h
index ef1d72dbdfe02b74d389c2067af12373db2cd3de..3b1510b4fc5741290d5660bb4c30f34bc70f6371 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef ASM_X86__APIC_H
-#define ASM_X86__APIC_H
+#ifndef _ASM_X86_APIC_H
+#define _ASM_X86_APIC_H
 
 #include <linux/pm.h>
 #include <linux/delay.h>
@@ -196,4 +196,4 @@ static inline void init_apic_mappings(void) { }
 
 #endif /* !CONFIG_X86_LOCAL_APIC */
 
-#endif /* ASM_X86__APIC_H */
+#endif /* _ASM_X86_APIC_H */
similarity index 99%
rename from include/asm-x86/apicdef.h
rename to arch/x86/include/asm/apicdef.h
index b922c85ac91d8ab0e3f8fbd6c993f22ffe047879..63134e31e8b933acb973ee2e66f62a2f815bb326 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef ASM_X86__APICDEF_H
-#define ASM_X86__APICDEF_H
+#ifndef _ASM_X86_APICDEF_H
+#define _ASM_X86_APICDEF_H
 
 /*
  * Constants for various Intel APICs. (local APIC, IOAPIC, etc.)
@@ -414,4 +414,4 @@ struct local_apic {
 #else
  #define BAD_APICID 0xFFFFu
 #endif
-#endif /* ASM_X86__APICDEF_H */
+#endif /* _ASM_X86_APICDEF_H */
similarity index 86%
rename from include/asm-x86/arch_hooks.h
rename to arch/x86/include/asm/arch_hooks.h
index de4596b24c23a8e4a0e14135125d051f25a3fcdf..cbd4957838a60d83ad767e5b8a1935aa44d30f5a 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef ASM_X86__ARCH_HOOKS_H
-#define ASM_X86__ARCH_HOOKS_H
+#ifndef _ASM_X86_ARCH_HOOKS_H
+#define _ASM_X86_ARCH_HOOKS_H
 
 #include <linux/interrupt.h>
 
@@ -23,4 +23,4 @@ extern void pre_time_init_hook(void);
 extern void time_init_hook(void);
 extern void mca_nmi_hook(void);
 
-#endif /* ASM_X86__ARCH_HOOKS_H */
+#endif /* _ASM_X86_ARCH_HOOKS_H */
similarity index 93%
rename from include/asm-x86/asm.h
rename to arch/x86/include/asm/asm.h
index e1355f44d7c3395753317faaf2b2fb61f100bfea..56be78f582f0eabff9f9a64545a15bc28b518710 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef ASM_X86__ASM_H
-#define ASM_X86__ASM_H
+#ifndef _ASM_X86_ASM_H
+#define _ASM_X86_ASM_H
 
 #ifdef __ASSEMBLY__
 # define __ASM_FORM(x) x
@@ -44,4 +44,4 @@
        _ASM_PTR #from "," #to "\n" \
        " .previous\n"
 
-#endif /* ASM_X86__ASM_H */
+#endif /* _ASM_X86_ASM_H */
similarity index 98%
rename from include/asm-x86/atomic_32.h
rename to arch/x86/include/asm/atomic_32.h
index 14d3f0beb889917c3d6af356bdd84d114a7cae06..ad5b9f6ecddf317e32f1abad071246b61471999a 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef ASM_X86__ATOMIC_32_H
-#define ASM_X86__ATOMIC_32_H
+#ifndef _ASM_X86_ATOMIC_32_H
+#define _ASM_X86_ATOMIC_32_H
 
 #include <linux/compiler.h>
 #include <asm/processor.h>
@@ -256,4 +256,4 @@ static inline int atomic_add_unless(atomic_t *v, int a, int u)
 #define smp_mb__after_atomic_inc()     barrier()
 
 #include <asm-generic/atomic.h>
-#endif /* ASM_X86__ATOMIC_32_H */
+#endif /* _ASM_X86_ATOMIC_32_H */
similarity index 99%
rename from include/asm-x86/atomic_64.h
rename to arch/x86/include/asm/atomic_64.h
index 2cb218c4a356ce332b2e887b88e8d146e602fe84..279d2a731f3fb57e9cdb061d1917df4ed7bb053e 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef ASM_X86__ATOMIC_64_H
-#define ASM_X86__ATOMIC_64_H
+#ifndef _ASM_X86_ATOMIC_64_H
+#define _ASM_X86_ATOMIC_64_H
 
 #include <asm/alternative.h>
 #include <asm/cmpxchg.h>
@@ -470,4 +470,4 @@ static inline void atomic_or_long(unsigned long *v1, unsigned long v2)
 #define smp_mb__after_atomic_inc()     barrier()
 
 #include <asm-generic/atomic.h>
-#endif /* ASM_X86__ATOMIC_64_H */
+#endif /* _ASM_X86_ATOMIC_64_H */
similarity index 70%
rename from include/asm-x86/auxvec.h
rename to arch/x86/include/asm/auxvec.h
index 12c7cac7420202c7a4a11997187b966bc4d392c4..1316b4c3542594cf42024fa98b7cee52afb8b882 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef ASM_X86__AUXVEC_H
-#define ASM_X86__AUXVEC_H
+#ifndef _ASM_X86_AUXVEC_H
+#define _ASM_X86_AUXVEC_H
 /*
  * Architecture-neutral AT_ values in 0-17, leave some room
  * for more of them, start the x86-specific ones at 32.
@@ -9,4 +9,4 @@
 #endif
 #define AT_SYSINFO_EHDR                33
 
-#endif /* ASM_X86__AUXVEC_H */
+#endif /* _ASM_X86_AUXVEC_H */
similarity index 88%
rename from include/asm-x86/bios_ebda.h
rename to arch/x86/include/asm/bios_ebda.h
index 79b4b88505d743eed1e0e5ad7c6e55df8dc63c3f..3c7521063d3fd3f70ea346cf855e4d02c4fdb9f0 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef ASM_X86__BIOS_EBDA_H
-#define ASM_X86__BIOS_EBDA_H
+#ifndef _ASM_X86_BIOS_EBDA_H
+#define _ASM_X86_BIOS_EBDA_H
 
 #include <asm/io.h>
 
@@ -33,4 +33,4 @@ static inline void start_periodic_check_for_corruption(void)
 }
 #endif
 
-#endif /* ASM_X86__BIOS_EBDA_H */
+#endif /* _ASM_X86_BIOS_EBDA_H */
similarity index 99%
rename from include/asm-x86/bitops.h
rename to arch/x86/include/asm/bitops.h
index 451a74762bd4e95aa3fd1ba20c2c6230ced14c84..360010322711037f80040829acceed8de6a15f42 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef ASM_X86__BITOPS_H
-#define ASM_X86__BITOPS_H
+#ifndef _ASM_X86_BITOPS_H
+#define _ASM_X86_BITOPS_H
 
 /*
  * Copyright 1992, Linus Torvalds.
@@ -448,4 +448,4 @@ static inline int fls(int x)
 #include <asm-generic/bitops/minix.h>
 
 #endif /* __KERNEL__ */
-#endif /* ASM_X86__BITOPS_H */
+#endif /* _ASM_X86_BITOPS_H */
similarity index 89%
rename from include/asm-x86/boot.h
rename to arch/x86/include/asm/boot.h
index 1d63bd5d59462833cd5a458956c20a2d05618d9e..dd61616cb73d1d3aab1bb7d5c2dfd8923ec6e672 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef ASM_X86__BOOT_H
-#define ASM_X86__BOOT_H
+#ifndef _ASM_X86_BOOT_H
+#define _ASM_X86_BOOT_H
 
 /* Don't touch these, unless you really know what you're doing. */
 #define DEF_SYSSEG     0x1000
@@ -23,4 +23,4 @@
 #define BOOT_STACK_SIZE        0x1000
 #endif
 
-#endif /* ASM_X86__BOOT_H */
+#endif /* _ASM_X86_BOOT_H */
similarity index 96%
rename from include/asm-x86/bootparam.h
rename to arch/x86/include/asm/bootparam.h
index ccf027e2d97da02eabaab3d54eea8bd4fe727d87..433adaebf9b631f108399a3d27f660ff61a0369b 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef ASM_X86__BOOTPARAM_H
-#define ASM_X86__BOOTPARAM_H
+#ifndef _ASM_X86_BOOTPARAM_H
+#define _ASM_X86_BOOTPARAM_H
 
 #include <linux/types.h>
 #include <linux/screen_info.h>
@@ -108,4 +108,4 @@ struct boot_params {
        __u8  _pad9[276];                               /* 0xeec */
 } __attribute__((packed));
 
-#endif /* ASM_X86__BOOTPARAM_H */
+#endif /* _ASM_X86_BOOTPARAM_H */
similarity index 90%
rename from include/asm-x86/bug.h
rename to arch/x86/include/asm/bug.h
index 91ad43a54c47c6f9b9cb28bfc3cb7003a7b666a1..3def2065fcea73ba085fcb31ee5063e2cfc57adb 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef ASM_X86__BUG_H
-#define ASM_X86__BUG_H
+#ifndef _ASM_X86_BUG_H
+#define _ASM_X86_BUG_H
 
 #ifdef CONFIG_BUG
 #define HAVE_ARCH_BUG
@@ -36,4 +36,4 @@ do {                                                          \
 #endif /* !CONFIG_BUG */
 
 #include <asm-generic/bug.h>
-#endif /* ASM_X86__BUG_H */
+#endif /* _ASM_X86_BUG_H */
similarity index 71%
rename from include/asm-x86/bugs.h
rename to arch/x86/include/asm/bugs.h
index dc604985f2ad71a92be6de6a7f9d48d70816bc2d..08abf639075f92b795d014cfde240d2769a224d5 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef ASM_X86__BUGS_H
-#define ASM_X86__BUGS_H
+#ifndef _ASM_X86_BUGS_H
+#define _ASM_X86_BUGS_H
 
 extern void check_bugs(void);
 
@@ -9,4 +9,4 @@ int ppro_with_ram_bug(void);
 static inline int ppro_with_ram_bug(void) { return 0; }
 #endif
 
-#endif /* ASM_X86__BUGS_H */
+#endif /* _ASM_X86_BUGS_H */
similarity index 94%
rename from include/asm-x86/byteorder.h
rename to arch/x86/include/asm/byteorder.h
index 722f27d68105f8e454ccaf01d1b7de4baa8dd0ce..e02ae2d89acf13936aad26502e485aa6ddae0b65 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef ASM_X86__BYTEORDER_H
-#define ASM_X86__BYTEORDER_H
+#ifndef _ASM_X86_BYTEORDER_H
+#define _ASM_X86_BYTEORDER_H
 
 #include <asm/types.h>
 #include <linux/compiler.h>
@@ -78,4 +78,4 @@ static inline __attribute_const__ __u32 ___arch__swab32(__u32 x)
 
 #include <linux/byteorder/little_endian.h>
 
-#endif /* ASM_X86__BYTEORDER_H */
+#endif /* _ASM_X86_BYTEORDER_H */
similarity index 85%
rename from include/asm-x86/cache.h
rename to arch/x86/include/asm/cache.h
index ea3f1cc06a974e8d3255bb07e74777f390976afa..5d367caa0e36c437e17cb29f76dc285d9b6d4a49 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef ASM_X86__CACHE_H
-#define ASM_X86__CACHE_H
+#ifndef _ASM_X86_CACHE_H
+#define _ASM_X86_CACHE_H
 
 /* L1 cache line size */
 #define L1_CACHE_SHIFT (CONFIG_X86_L1_CACHE_SHIFT)
@@ -17,4 +17,4 @@
 #endif
 #endif
 
-#endif /* ASM_X86__CACHE_H */
+#endif /* _ASM_X86_CACHE_H */
similarity index 97%
rename from include/asm-x86/cacheflush.h
rename to arch/x86/include/asm/cacheflush.h
index 68840ef1b35a01c01fa7e23e45f3b5c0415d39e8..2f8466540fb52237c71373513304ddbf5627b873 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef ASM_X86__CACHEFLUSH_H
-#define ASM_X86__CACHEFLUSH_H
+#ifndef _ASM_X86_CACHEFLUSH_H
+#define _ASM_X86_CACHEFLUSH_H
 
 /* Keep includes the same across arches.  */
 #include <linux/mm.h>
@@ -115,4 +115,4 @@ static inline int rodata_test(void)
 }
 #endif
 
-#endif /* ASM_X86__CACHEFLUSH_H */
+#endif /* _ASM_X86_CACHEFLUSH_H */
similarity index 96%
rename from include/asm-x86/calgary.h
rename to arch/x86/include/asm/calgary.h
index 933fd272f82663c6ed0c2224df4e668a0870681c..b03bedb62aa7f43ab8bc8f75168206dfbb5dd721 100644 (file)
@@ -21,8 +21,8 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
  */
 
-#ifndef ASM_X86__CALGARY_H
-#define ASM_X86__CALGARY_H
+#ifndef _ASM_X86_CALGARY_H
+#define _ASM_X86_CALGARY_H
 
 #include <linux/spinlock.h>
 #include <linux/device.h>
@@ -69,4 +69,4 @@ static inline int calgary_iommu_init(void) { return 1; }
 static inline void detect_calgary(void) { return; }
 #endif
 
-#endif /* ASM_X86__CALGARY_H */
+#endif /* _ASM_X86_CALGARY_H */
similarity index 97%
rename from include/asm-x86/checksum_32.h
rename to arch/x86/include/asm/checksum_32.h
index d041e8cda227a6b191f70052599b00383af83ea7..7c5ef8b14d925624e85fd3f2d589cbbbb98a4292 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef ASM_X86__CHECKSUM_32_H
-#define ASM_X86__CHECKSUM_32_H
+#ifndef _ASM_X86_CHECKSUM_32_H
+#define _ASM_X86_CHECKSUM_32_H
 
 #include <linux/in6.h>
 
@@ -186,4 +186,4 @@ static inline __wsum csum_and_copy_to_user(const void *src,
        return (__force __wsum)-1; /* invalid checksum */
 }
 
-#endif /* ASM_X86__CHECKSUM_32_H */
+#endif /* _ASM_X86_CHECKSUM_32_H */
similarity index 98%
rename from include/asm-x86/checksum_64.h
rename to arch/x86/include/asm/checksum_64.h
index 110f403beb8953d60218bc5b8c940b9f92dc80bd..9bfdc41629ecb8478135754cd89659f358fcc2c0 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef ASM_X86__CHECKSUM_64_H
-#define ASM_X86__CHECKSUM_64_H
+#ifndef _ASM_X86_CHECKSUM_64_H
+#define _ASM_X86_CHECKSUM_64_H
 
 /*
  * Checksums for x86-64
@@ -188,4 +188,4 @@ static inline unsigned add32_with_carry(unsigned a, unsigned b)
        return a;
 }
 
-#endif /* ASM_X86__CHECKSUM_64_H */
+#endif /* _ASM_X86_CHECKSUM_64_H */
similarity index 98%
rename from include/asm-x86/cmpxchg_32.h
rename to arch/x86/include/asm/cmpxchg_32.h
index 0622e45cdf7cf2b26413e506ef98a0352d6fb400..82ceb788a981e7c73a7cb06e3d0bec311e205be7 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef ASM_X86__CMPXCHG_32_H
-#define ASM_X86__CMPXCHG_32_H
+#ifndef _ASM_X86_CMPXCHG_32_H
+#define _ASM_X86_CMPXCHG_32_H
 
 #include <linux/bitops.h> /* for LOCK_PREFIX */
 
@@ -341,4 +341,4 @@ extern unsigned long long cmpxchg_486_u64(volatile void *, u64, u64);
 
 #endif
 
-#endif /* ASM_X86__CMPXCHG_32_H */
+#endif /* _ASM_X86_CMPXCHG_32_H */
similarity index 97%
rename from include/asm-x86/cmpxchg_64.h
rename to arch/x86/include/asm/cmpxchg_64.h
index 63c1a5e61b994a781ef3ff8e9c1f858e9afac264..52de72e0de8c882c3673fcff25c315f270db977f 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef ASM_X86__CMPXCHG_64_H
-#define ASM_X86__CMPXCHG_64_H
+#ifndef _ASM_X86_CMPXCHG_64_H
+#define _ASM_X86_CMPXCHG_64_H
 
 #include <asm/alternative.h> /* Provides LOCK_PREFIX */
 
@@ -182,4 +182,4 @@ static inline unsigned long __cmpxchg_local(volatile void *ptr,
        cmpxchg_local((ptr), (o), (n));                                 \
 })
 
-#endif /* ASM_X86__CMPXCHG_64_H */
+#endif /* _ASM_X86_CMPXCHG_64_H */
similarity index 98%
rename from include/asm-x86/compat.h
rename to arch/x86/include/asm/compat.h
index 6732b150949e8c8ef0b333673c5b92438c3a9a9e..9a9c7bdc923dee66a411bdae3f30065e9e4ee09f 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef ASM_X86__COMPAT_H
-#define ASM_X86__COMPAT_H
+#ifndef _ASM_X86_COMPAT_H
+#define _ASM_X86_COMPAT_H
 
 /*
  * Architecture specific compatibility types
@@ -215,4 +215,4 @@ static inline int is_compat_task(void)
        return current_thread_info()->status & TS_COMPAT;
 }
 
-#endif /* ASM_X86__COMPAT_H */
+#endif /* _ASM_X86_COMPAT_H */
similarity index 80%
rename from include/asm-x86/cpu.h
rename to arch/x86/include/asm/cpu.h
index 83a115083f0d74ad3eb0f82eae64e19aea5a7cc1..bae482df6039a5122617bbc781db52fbf8ae56e2 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef ASM_X86__CPU_H
-#define ASM_X86__CPU_H
+#ifndef _ASM_X86_CPU_H
+#define _ASM_X86_CPU_H
 
 #include <linux/device.h>
 #include <linux/cpu.h>
@@ -17,4 +17,4 @@ extern void arch_unregister_cpu(int);
 #endif
 
 DECLARE_PER_CPU(int, cpu_state);
-#endif /* ASM_X86__CPU_H */
+#endif /* _ASM_X86_CPU_H */
similarity index 99%
rename from include/asm-x86/cpufeature.h
rename to arch/x86/include/asm/cpufeature.h
index adfeae6586e175f9972012a94c823ede9527d0d1..f73e95d75b45b48b360aaadf8a4c3d26b31b5b14 100644 (file)
@@ -1,8 +1,8 @@
 /*
  * Defines x86 CPU feature bits
  */
-#ifndef ASM_X86__CPUFEATURE_H
-#define ASM_X86__CPUFEATURE_H
+#ifndef _ASM_X86_CPUFEATURE_H
+#define _ASM_X86_CPUFEATURE_H
 
 #include <asm/required-features.h>
 
@@ -268,4 +268,4 @@ extern const char * const x86_power_flags[32];
 
 #endif /* defined(__KERNEL__) && !defined(__ASSEMBLY__) */
 
-#endif /* ASM_X86__CPUFEATURE_H */
+#endif /* _ASM_X86_CPUFEATURE_H */
similarity index 87%
rename from include/asm-x86/current.h
rename to arch/x86/include/asm/current.h
index a863ead856f3d37de49d023a156f98b1d4f540c5..0930b4f8d672249145ea249cbc0d272471e822de 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef ASM_X86__CURRENT_H
-#define ASM_X86__CURRENT_H
+#ifndef _ASM_X86_CURRENT_H
+#define _ASM_X86_CURRENT_H
 
 #ifdef CONFIG_X86_32
 #include <linux/compiler.h>
@@ -36,4 +36,4 @@ static __always_inline struct task_struct *get_current(void)
 
 #define current get_current()
 
-#endif /* ASM_X86__CURRENT_H */
+#endif /* _ASM_X86_CURRENT_H */
similarity index 96%
rename from include/asm-x86/debugreg.h
rename to arch/x86/include/asm/debugreg.h
index ecb6907c3ea4ff97ef7aacb4b9c47809ef2701c4..3ea6f37be9e2d29a69f6982bb3ddcc80554f1652 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef ASM_X86__DEBUGREG_H
-#define ASM_X86__DEBUGREG_H
+#ifndef _ASM_X86_DEBUGREG_H
+#define _ASM_X86_DEBUGREG_H
 
 
 /* Indicate the register numbers for a number of the specific
@@ -67,4 +67,4 @@
 #define DR_LOCAL_SLOWDOWN (0x100)   /* Local slow the pipeline */
 #define DR_GLOBAL_SLOWDOWN (0x200)  /* Global slow the pipeline */
 
-#endif /* ASM_X86__DEBUGREG_H */
+#endif /* _ASM_X86_DEBUGREG_H */
similarity index 90%
rename from include/asm-x86/delay.h
rename to arch/x86/include/asm/delay.h
index 8a0da95b4fc50e290187fd3bf3eb05b161fdf955..409a649204aa7308c8936d6cc08d4479222d6885 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef ASM_X86__DELAY_H
-#define ASM_X86__DELAY_H
+#ifndef _ASM_X86_DELAY_H
+#define _ASM_X86_DELAY_H
 
 /*
  * Copyright (C) 1993 Linus Torvalds
@@ -28,4 +28,4 @@ extern void __delay(unsigned long loops);
 
 void use_tsc_delay(void);
 
-#endif /* ASM_X86__DELAY_H */
+#endif /* _ASM_X86_DELAY_H */
similarity index 99%
rename from include/asm-x86/desc.h
rename to arch/x86/include/asm/desc.h
index f06adac7938c746f87b02939205b3d3370c100a0..e6b82b17b0721095cb79fced0888d320eb64230a 100644 (file)
@@ -1,5 +1,5 @@
-#ifndef ASM_X86__DESC_H
-#define ASM_X86__DESC_H
+#ifndef _ASM_X86_DESC_H
+#define _ASM_X86_DESC_H
 
 #ifndef __ASSEMBLY__
 #include <asm/desc_defs.h>
@@ -406,4 +406,4 @@ static inline void set_system_intr_gate_ist(int n, void *addr, unsigned ist)
 
 #endif /* __ASSEMBLY__ */
 
-#endif /* ASM_X86__DESC_H */
+#endif /* _ASM_X86_DESC_H */
similarity index 96%
rename from include/asm-x86/desc_defs.h
rename to arch/x86/include/asm/desc_defs.h
index b881db664b46a27927d9febc4f16e39e24227d49..a6adefa28b946f4bc8d996bd2a6