diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 10:22:01 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-10-23 10:22:01 -0700 |
| commit | 5b34653963de7a6d0d8c783527457d68fddc60fb (patch) | |
| tree | 1a234741e1823a54cd0514616f783b4cf503a528 | |
| parent | 765426e8ee4c0ab2bc9d44951f4865b8494cdbd0 (diff) | |
| parent | 5e1b00758b5a8bee9d42515bffdaf305a32f1b04 (diff) | |
Merge branch 'x86/um-header' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* '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)
...
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | arch/ia64/ia32/audit.c | 2 | ||||
| -rw-r--r-- | arch/powerpc/include/asm/signal.h | 1 | ||||
| -rw-r--r-- | arch/powerpc/kernel/signal.h | 2 | ||||
| -rw-r--r-- | arch/um/Kconfig.common | 77 | ||||
| -rw-r--r-- | arch/um/Kconfig.rest | 42 | ||||
| -rw-r--r-- | arch/um/Kconfig.um (renamed from arch/um/Kconfig) | 122 | ||||
| -rw-r--r-- | arch/um/Kconfig.x86 (renamed from arch/um/Kconfig.i386) | 43 | ||||
| -rw-r--r-- | arch/um/Kconfig.x86_64 | 39 | ||||
| -rw-r--r-- | arch/um/Makefile | 93 | ||||
| -rw-r--r-- | arch/um/Makefile-os-Linux | 1 | ||||
| -rw-r--r-- | arch/um/drivers/Makefile | 1 | ||||
| -rw-r--r-- | arch/um/include/asm/a.out-core.h (renamed from include/asm-um/a.out-core.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/asm/apic.h (renamed from include/asm-um/apic.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/asm/auxvec.h (renamed from include/asm-um/auxvec.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/asm/bugs.h (renamed from include/asm-um/bugs.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/asm/cache.h (renamed from include/asm-um/cache.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/asm/checksum.h (renamed from include/asm-um/checksum.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/asm/common.lds.S (renamed from include/asm-um/common.lds.S) | 0 | ||||
| -rw-r--r-- | arch/um/include/asm/cputime.h (renamed from include/asm-um/cputime.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/asm/current.h (renamed from include/asm-um/current.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/asm/delay.h (renamed from include/asm-um/delay.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/asm/desc.h (renamed from include/asm-um/desc.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/asm/device.h (renamed from include/asm-um/device.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/asm/dma-mapping.h (renamed from include/asm-um/dma-mapping.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/asm/dma.h (renamed from include/asm-um/dma.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/asm/emergency-restart.h (renamed from include/asm-um/emergency-restart.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/asm/fixmap.h (renamed from include/asm-um/fixmap.h) | 1 | ||||
| -rw-r--r-- | arch/um/include/asm/futex.h (renamed from include/asm-um/futex.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/asm/hardirq.h (renamed from include/asm-um/hardirq.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/asm/hw_irq.h (renamed from include/asm-um/hw_irq.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/asm/io.h (renamed from include/asm-um/io.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/asm/irq.h (renamed from include/asm-um/irq.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/asm/irq_regs.h (renamed from include/asm-um/irq_regs.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/asm/irq_vectors.h (renamed from include/asm-um/irq_vectors.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/asm/irqflags.h (renamed from include/asm-um/irqflags.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/asm/kdebug.h (renamed from include/asm-um/kdebug.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/asm/kmap_types.h (renamed from include/asm-um/kmap_types.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/asm/mmu.h (renamed from include/asm-um/mmu.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/asm/mmu_context.h (renamed from include/asm-um/mmu_context.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/asm/mutex.h (renamed from include/asm-um/mutex.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/asm/page.h (renamed from include/asm-um/page.h) | 2 | ||||
| -rw-r--r-- | arch/um/include/asm/page_offset.h (renamed from include/asm-um/page_offset.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/asm/param.h (renamed from include/asm-um/param.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/asm/pci.h (renamed from include/asm-um/pci.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/asm/pda.h (renamed from include/asm-um/pda.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/asm/pgalloc.h (renamed from include/asm-um/pgalloc.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/asm/pgtable-2level.h (renamed from include/asm-um/pgtable-2level.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/asm/pgtable-3level.h (renamed from include/asm-um/pgtable-3level.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/asm/pgtable.h (renamed from include/asm-um/pgtable.h) | 8 | ||||
| -rw-r--r-- | arch/um/include/asm/processor-generic.h (renamed from include/asm-um/processor-generic.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/asm/ptrace-generic.h (renamed from include/asm-um/ptrace-generic.h) | 2 | ||||
| -rw-r--r-- | arch/um/include/asm/required-features.h (renamed from include/asm-um/required-features.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/asm/sections.h (renamed from include/asm-um/sections.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/asm/segment.h (renamed from include/asm-um/segment.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/asm/setup.h (renamed from include/asm-um/setup.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/asm/smp.h (renamed from include/asm-um/smp.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/asm/suspend.h (renamed from include/asm-um/suspend.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/asm/system.h (renamed from include/asm-um/system-generic.h) | 14 | ||||
| -rw-r--r-- | arch/um/include/asm/thread_info.h (renamed from include/asm-um/thread_info.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/asm/timex.h (renamed from include/asm-um/timex.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/asm/tlb.h (renamed from include/asm-um/tlb.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/asm/tlbflush.h (renamed from include/asm-um/tlbflush.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/asm/topology.h (renamed from include/asm-um/topology.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/asm/uaccess.h (renamed from include/asm-um/uaccess.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/asm/xor.h (renamed from include/asm-um/xor.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/shared/aio.h (renamed from arch/um/include/aio.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/shared/arch.h (renamed from arch/um/include/arch.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/shared/as-layout.h (renamed from arch/um/include/as-layout.h) | 1 | ||||
| -rw-r--r-- | arch/um/include/shared/chan_kern.h (renamed from arch/um/include/chan_kern.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/shared/chan_user.h (renamed from arch/um/include/chan_user.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/shared/common-offsets.h (renamed from arch/um/include/common-offsets.h) | 13 | ||||
| -rw-r--r-- | arch/um/include/shared/elf_user.h (renamed from arch/um/include/elf_user.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/shared/frame_kern.h (renamed from arch/um/include/frame_kern.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/shared/init.h (renamed from arch/um/include/init.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/shared/initrd.h (renamed from arch/um/include/initrd.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/shared/irq_kern.h (renamed from arch/um/include/irq_kern.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/shared/irq_user.h (renamed from arch/um/include/irq_user.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/shared/kern.h (renamed from arch/um/include/kern.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/shared/kern_util.h (renamed from arch/um/include/kern_util.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/shared/ldt.h (renamed from include/asm-um/ldt.h) | 2 | ||||
| -rw-r--r-- | arch/um/include/shared/line.h (renamed from arch/um/include/line.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/shared/longjmp.h (renamed from arch/um/include/longjmp.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/shared/mconsole.h (renamed from arch/um/include/mconsole.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/shared/mconsole_kern.h (renamed from arch/um/include/mconsole_kern.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/shared/mem.h (renamed from arch/um/include/mem.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/shared/mem_kern.h (renamed from arch/um/include/mem_kern.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/shared/mem_user.h (renamed from arch/um/include/mem_user.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/shared/net_kern.h (renamed from arch/um/include/net_kern.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/shared/net_user.h (renamed from arch/um/include/net_user.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/shared/os.h (renamed from arch/um/include/os.h) | 1 | ||||
| -rw-r--r-- | arch/um/include/shared/process.h (renamed from arch/um/include/process.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/shared/ptrace_user.h (renamed from arch/um/include/ptrace_user.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/shared/registers.h (renamed from arch/um/include/registers.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/shared/sigio.h (renamed from arch/um/include/sigio.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/shared/skas/mm_id.h (renamed from arch/um/include/skas/mm_id.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/shared/skas/proc_mm.h (renamed from arch/um/include/skas/proc_mm.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/shared/skas/skas.h (renamed from arch/um/include/skas/skas.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/shared/skas/stub-data.h (renamed from arch/um/include/skas/stub-data.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/shared/skas_ptrace.h (renamed from arch/um/include/skas_ptrace.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/shared/skas_ptregs.h (renamed from arch/um/include/skas_ptregs.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/shared/syscall.h (renamed from arch/um/include/syscall.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/shared/sysrq.h (renamed from arch/um/include/sysrq.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/shared/task.h (renamed from arch/um/include/task.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/shared/tlb.h (renamed from arch/um/include/tlb.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/shared/ubd_user.h (renamed from arch/um/include/ubd_user.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/shared/um_malloc.h (renamed from arch/um/include/um_malloc.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/shared/um_mmu.h (renamed from arch/um/include/um_mmu.h) | 3 | ||||
| -rw-r--r-- | arch/um/include/shared/um_uaccess.h (renamed from arch/um/include/um_uaccess.h) | 0 | ||||
| -rw-r--r-- | arch/um/include/shared/user.h (renamed from arch/um/include/user.h) | 2 | ||||
| -rw-r--r-- | arch/um/include/sigcontext.h | 25 | ||||
| -rw-r--r-- | arch/um/kernel/exec.c | 1 | ||||
| -rw-r--r-- | arch/um/kernel/internal.h | 1 | ||||
| -rw-r--r-- | arch/um/kernel/signal.c | 2 | ||||
| -rw-r--r-- | arch/um/kernel/syscall.c | 1 | ||||
| -rw-r--r-- | arch/um/os-Linux/include/file.h | 11 | ||||
| -rw-r--r-- | arch/um/os-Linux/skas/mem.c | 1 | ||||
| -rw-r--r-- | arch/um/sys-i386/asm/archparam.h (renamed from include/asm-um/archparam-i386.h) | 10 | ||||
| -rw-r--r-- | arch/um/sys-i386/asm/elf.h (renamed from include/asm-um/elf-i386.h) | 0 | ||||
| -rw-r--r-- | arch/um/sys-i386/asm/module.h (renamed from include/asm-um/module-i386.h) | 0 | ||||
| -rw-r--r-- | arch/um/sys-i386/asm/processor.h (renamed from include/asm-um/processor-i386.h) | 4 | ||||
| -rw-r--r-- | arch/um/sys-i386/asm/ptrace.h (renamed from include/asm-um/ptrace-i386.h) | 4 | ||||
| -rw-r--r-- | arch/um/sys-i386/shared/sysdep/archsetjmp.h (renamed from arch/um/include/sysdep-i386/archsetjmp.h) | 0 | ||||
| -rw-r--r-- | arch/um/sys-i386/shared/sysdep/barrier.h (renamed from arch/um/include/sysdep-i386/barrier.h) | 0 | ||||
| -rw-r--r-- | arch/um/sys-i386/shared/sysdep/checksum.h (renamed from arch/um/include/sysdep-i386/checksum.h) | 0 | ||||
| -rw-r--r-- | arch/um/sys-i386/shared/sysdep/faultinfo.h (renamed from arch/um/include/sysdep-i386/faultinfo.h) | 0 | ||||
| -rw-r--r-- | arch/um/sys-i386/shared/sysdep/host_ldt.h (renamed from include/asm-um/host_ldt-i386.h) | 2 | ||||
| -rw-r--r-- | arch/um/sys-i386/shared/sysdep/kernel-offsets.h (renamed from arch/um/include/sysdep-i386/kernel-offsets.h) | 0 | ||||
| -rw-r--r-- | arch/um/sys-i386/shared/sysdep/ptrace.h (renamed from arch/um/include/sysdep-i386/ptrace.h) | 1 | ||||
| -rw-r--r-- | arch/um/sys-i386/shared/sysdep/ptrace_user.h (renamed from arch/um/include/sysdep-i386/ptrace_user.h) | 0 |