diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2008-08-17 13:48:37 -0400 |
---|---|---|
committer | H. Peter Anvin <hpa@zytor.com> | 2008-10-22 22:55:19 -0700 |
commit | 8569c9140bd41089f9b6be8837ca421102714a90 (patch) | |
tree | cd289b322b215fe2ca2530aa320febfd99388d7f | |
parent | 2515ddc6db8eb49a79f0fe5e67ff09ac7c81eab4 (diff) | |
download | op-kernel-dev-8569c9140bd41089f9b6be8837ca421102714a90.zip op-kernel-dev-8569c9140bd41089f9b6be8837ca421102714a90.tar.gz |
x86, um: take arch/um/include/* out of the way
We can't just plop asm/* into it - userland helpers are built with it
in search path and seeing asm/* show up there suddenly would be a bad
idea.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
-rw-r--r-- | arch/um/Makefile | 51 | ||||
-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) | 0 | ||||
-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) | 0 | ||||
-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/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) | 2 | ||||
-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/sigcontext.h (renamed from arch/um/include/sigcontext.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/sysdep-i386/archsetjmp.h (renamed from arch/um/include/sysdep-i386/archsetjmp.h) | 0 | ||||
-rw-r--r-- | arch/um/include/shared/sysdep-i386/barrier.h (renamed from arch/um/include/sysdep-i386/barrier.h) | 0 | ||||
-rw-r--r-- | arch/um/include/shared/sysdep-i386/checksum.h (renamed from arch/um/include/sysdep-i386/checksum.h) | 0 | ||||
-rw-r--r-- | arch/um/include/shared/sysdep-i386/faultinfo.h (renamed from arch/um/include/sysdep-i386/faultinfo.h) | 0 | ||||
-rw-r--r-- | arch/um/include/shared/sysdep-i386/kernel-offsets.h (renamed from arch/um/include/sysdep-i386/kernel-offsets.h) | 0 | ||||
-rw-r--r-- | arch/um/include/shared/sysdep-i386/ptrace.h (renamed from arch/um/include/sysdep-i386/ptrace.h) | 0 | ||||
-rw-r--r-- | arch/um/include/shared/sysdep-i386/ptrace_user.h (renamed from arch/um/include/sysdep-i386/ptrace_user.h) | 0 | ||||
-rw-r--r-- | arch/um/include/shared/sysdep-i386/sc.h (renamed from arch/um/include/sysdep-i386/sc.h) | 0 | ||||
-rw-r--r-- | arch/um/include/shared/sysdep-i386/sigcontext.h (renamed from arch/um/include/sysdep-i386/sigcontext.h) | 0 | ||||
-rw-r--r-- | arch/um/include/shared/sysdep-i386/skas_ptrace.h (renamed from arch/um/include/sysdep-i386/skas_ptrace.h) | 0 | ||||
-rw-r--r-- | arch/um/include/shared/sysdep-i386/stub.h (renamed from arch/um/include/sysdep-i386/stub.h) | 0 | ||||
-rw-r--r-- | arch/um/include/shared/sysdep-i386/syscalls.h (renamed from arch/um/include/sysdep-i386/syscalls.h) | 0 | ||||
-rw-r--r-- | arch/um/include/shared/sysdep-i386/tls.h (renamed from arch/um/include/sysdep-i386/tls.h) | 0 | ||||
-rw-r--r-- | arch/um/include/shared/sysdep-ia64/ptrace.h (renamed from arch/um/include/sysdep-ia64/ptrace.h) | 0 | ||||
-rw-r--r-- | arch/um/include/shared/sysdep-ia64/sigcontext.h (renamed from arch/um/include/sysdep-ia64/sigcontext.h) | 0 | ||||
-rw-r--r-- | arch/um/include/shared/sysdep-ia64/skas_ptrace.h (renamed from arch/um/include/sysdep-ia64/skas_ptrace.h) | 0 | ||||
-rw-r--r-- | arch/um/include/shared/sysdep-ia64/syscalls.h (renamed from arch/um/include/sysdep-ia64/syscalls.h) | 0 | ||||
-rw-r--r-- | arch/um/include/shared/sysdep-ppc/ptrace.h (renamed from arch/um/include/sysdep-ppc/ptrace.h) | 0 | ||||
-rw-r--r-- | arch/um/include/shared/sysdep-ppc/sigcontext.h (renamed from arch/um/include/sysdep-ppc/sigcontext.h) | 0 | ||||
-rw-r--r-- | arch/um/include/shared/sysdep-ppc/skas_ptrace.h (renamed from arch/um/include/sysdep-ppc/skas_ptrace.h) | 0 | ||||
-rw-r--r-- | arch/um/include/shared/sysdep-ppc/syscalls.h (renamed from arch/um/include/sysdep-ppc/syscalls.h) | 0 | ||||
-rw-r--r-- | arch/um/include/shared/sysdep-x86_64/archsetjmp.h (renamed from arch/um/include/sysdep-x86_64/archsetjmp.h) | 0 | ||||
-rw-r--r-- | arch/um/include/shared/sysdep-x86_64/barrier.h (renamed from arch/um/include/sysdep-x86_64/barrier.h) | 0 | ||||
-rw-r--r-- | arch/um/include/shared/sysdep-x86_64/checksum.h (renamed from arch/um/include/sysdep-x86_64/checksum.h) | 0 | ||||
-rw-r--r-- | arch/um/include/shared/sysdep-x86_64/faultinfo.h (renamed from arch/um/include/sysdep-x86_64/faultinfo.h) | 0 | ||||
-rw-r--r-- | arch/um/include/shared/sysdep-x86_64/kernel-offsets.h (renamed from arch/um/include/sysdep-x86_64/kernel-offsets.h) | 0 | ||||
-rw-r--r-- | arch/um/include/shared/sysdep-x86_64/ptrace.h (renamed from arch/um/include/sysdep-x86_64/ptrace.h) | 0 | ||||
-rw-r--r-- | arch/um/include/shared/sysdep-x86_64/ptrace_user.h (renamed from arch/um/include/sysdep-x86_64/ptrace_user.h) | 0 | ||||
-rw-r--r-- | arch/um/include/shared/sysdep-x86_64/sc.h (renamed from arch/um/include/sysdep-x86_64/sc.h) | 0 | ||||
-rw-r--r-- | arch/um/include/shared/sysdep-x86_64/sigcontext.h (renamed from arch/um/include/sysdep-x86_64/sigcontext.h) | 0 | ||||
-rw-r--r-- | arch/um/include/shared/sysdep-x86_64/skas_ptrace.h (renamed from arch/um/include/sysdep-x86_64/skas_ptrace.h) | 0 | ||||
-rw-r--r-- | arch/um/include/shared/sysdep-x86_64/stub.h (renamed from arch/um/include/sysdep-x86_64/stub.h) | 0 | ||||
-rw-r--r-- | arch/um/include/shared/sysdep-x86_64/syscalls.h (renamed from arch/um/include/sysdep-x86_64/syscalls.h) | 0 | ||||
-rw-r--r-- | arch/um/include/shared/sysdep-x86_64/tls.h (renamed from arch/um/include/sysdep-x86_64/tls.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) | 0 | ||||
-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) | 0 |
79 files changed, 26 insertions, 27 deletions
diff --git a/arch/um/Makefile b/arch/um/Makefile index ca40397..88c5b0a 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile @@ -28,18 +28,18 @@ SYMLINK_HEADERS := $(foreach header,$(SYMLINK_HEADERS),include/asm-um/$(header)) # # 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 +ARCH_SYMLINKS = include/asm-um/arch $(ARCH_DIR)/include/shared/sysdep $(ARCH_DIR)/os \ + $(SYMLINK_HEADERS) $(ARCH_DIR)/include/shared/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$(ARCH_DIR)/include/shared ifneq ($(KBUILD_SRC),) -ARCH_INCLUDE += -I$(srctree)/$(ARCH_DIR)/include +ARCH_INCLUDE += -I$(srctree)/$(ARCH_DIR)/include/shared endif -SYS_DIR := $(ARCH_DIR)/include/sysdep-$(SUBARCH) +SYS_DIR := $(ARCH_DIR)/include/shared/sysdep-$(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. @@ -96,11 +96,11 @@ 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) +$(shell ln -fsn Kconfig.$(SUBARCH) $(ARCH_DIR)/Kconfig.arch) endif -archprepare: $(ARCH_SYMLINKS) $(ARCH_DIR)/include/user_constants.h -prepare: $(ARCH_DIR)/include/kern_constants.h +archprepare: $(ARCH_SYMLINKS) $(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,9 +132,9 @@ 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 +CLEAN_FILES += linux x.i gmon.out $(ARCH_DIR)/include/shared/uml-config.h \ + $(ARCH_DIR)/include/shared/user_constants.h \ + $(ARCH_DIR)/include/shared/kern_constants.h $(ARCH_DIR)/Kconfig.arch MRPROPER_FILES += $(ARCH_SYMLINKS) @@ -148,37 +148,36 @@ 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 $@) + $(Q)ln -sf $(basename $(notdir $@))-$(SUBARCH)$(suffix $@) $@ 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 + $(Q)ln -fsn $(srctree)/include/asm-$(HEADER_ARCH) $@ else - $(Q)cd $(srctree)/include/asm-um && ln -fsn ../asm-$(HEADER_ARCH) arch + $(Q)ln -fsn ../asm-$(HEADER_ARCH) $@ endif -$(objtree)/$(ARCH_DIR)/include: +$(objtree)/$(ARCH_DIR)/include/shared: @echo ' MKDIR $@' $(Q)mkdir -p $@ -$(ARCH_DIR)/include/sysdep: $(objtree)/$(ARCH_DIR)/include +$(ARCH_DIR)/include/shared/sysdep: $(objtree)/$(ARCH_DIR)/include/shared @echo ' SYMLINK $@' ifneq ($(KBUILD_SRC),) - $(Q)ln -fsn $(srctree)/$(ARCH_DIR)/include/sysdep-$(SUBARCH) $(ARCH_DIR)/include/sysdep + $(Q)ln -fsn $(srctree)/$(ARCH_DIR)/include/shared/sysdep-$(SUBARCH) $@ else - $(Q)cd $(ARCH_DIR)/include && ln -fsn sysdep-$(SUBARCH) sysdep + $(Q)ln -fsn sysdep-$(SUBARCH) $@ endif $(ARCH_DIR)/os: @echo ' SYMLINK $@' ifneq ($(KBUILD_SRC),) - $(Q)ln -fsn $(srctree)/$(ARCH_DIR)/os-$(OS) $(ARCH_DIR)/os + $(Q)ln -fsn $(srctree)/$(ARCH_DIR)/os-$(OS) $@ else - $(Q)cd $(ARCH_DIR) && ln -fsn os-$(OS) os + $(Q)ln -fsn os-$(OS) $@ endif # Generated files @@ -186,7 +185,7 @@ define filechk_umlconfig sed 's/ CONFIG/ UML_CONFIG/' endef -$(ARCH_DIR)/include/uml-config.h : include/linux/autoconf.h +$(ARCH_DIR)/include/shared/uml-config.h : include/linux/autoconf.h $(call filechk,umlconfig) $(ARCH_DIR)/sys-$(SUBARCH)/user-offsets.s: FORCE @@ -205,11 +204,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-um/asm-offsets.h $@ export SUBARCH USER_CFLAGS CFLAGS_NO_HARDENING OS HEADER_ARCH diff --git a/arch/um/include/aio.h b/arch/um/include/shared/aio.h index 423bae91..423bae91 100644 --- a/arch/um/include/aio.h +++ b/arch/um/include/shared/aio.h diff --git a/arch/um/include/arch.h b/arch/um/include/shared/arch.h index 2de92a0..2de92a0 100644 --- a/arch/um/include/arch.h +++ b/arch/um/include/shared/arch.h diff --git a/arch/um/include/as-layout.h b/arch/um/include/shared/as-layout.h index 58e852d..58e852d 100644 --- a/arch/um/include/as-layout.h +++ b/arch/um/include/shared/as-layout.h diff --git a/arch/um/include/chan_kern.h b/arch/um/include/shared/chan_kern.h index 1e65145..1e65145 100644 --- a/arch/um/include/chan_kern.h +++ b/arch/um/include/shared/chan_kern.h diff --git a/arch/um/include/chan_user.h b/arch/um/include/shared/chan_user.h index 9b9ced8..9b9ced8 100644 --- a/arch/um/include/chan_user.h +++ b/arch/um/include/shared/chan_user.h diff --git a/arch/um/include/common-offsets.h b/arch/um/include/shared/common-offsets.h index b54bd35..b54bd35 100644 --- a/arch/um/include/common-offsets.h +++ b/arch/um/include/shared/common-offsets.h diff --git a/arch/um/include/elf_user.h b/arch/um/include/shared/elf_user.h index 53516b637..53516b637 100644 --- a/arch/um/include/elf_user.h +++ b/arch/um/include/shared/elf_user.h diff --git a/arch/um/include/frame_kern.h b/arch/um/include/shared/frame_kern.h index ce9514f..ce9514f 100644 --- a/arch/um/include/frame_kern.h +++ b/arch/um/include/shared/frame_kern.h diff --git a/arch/um/include/init.h b/arch/um/include/shared/init.h index 37dd097..37dd097 100644 --- a/arch/um/include/init.h +++ b/arch/um/include/shared/init.h diff --git a/arch/um/include/initrd.h b/arch/um/include/shared/initrd.h index 439b9a8..439b9a8 100644 --- a/arch/um/include/initrd.h +++ b/arch/um/include/shared/initrd.h diff --git a/arch/um/include/irq_kern.h b/arch/um/include/shared/irq_kern.h index fba3895..fba3895 100644 --- a/arch/um/include/irq_kern.h +++ b/arch/um/include/shared/irq_kern.h diff --git a/arch/um/include/irq_user.h b/arch/um/include/shared/irq_user.h index c6c784df..c6c784df 100644 --- a/arch/um/include/irq_user.h +++ b/arch/um/include/shared/irq_user.h diff --git a/arch/um/include/kern.h b/arch/um/include/shared/kern.h index 4ce3fc6..4ce3fc6 100644 --- a/arch/um/include/kern.h +++ b/arch/um/include/shared/kern.h diff --git a/arch/um/include/kern_util.h b/arch/um/include/shared/kern_util.h index 3c34122..3c34122 100644 --- a/arch/um/include/kern_util.h +++ b/arch/um/include/shared/kern_util.h diff --git a/arch/um/include/line.h b/arch/um/include/shared/line.h index 311a0d3..311a0d3 100644 --- a/arch/um/include/line.h +++ b/arch/um/include/shared/line.h diff --git a/arch/um/include/longjmp.h b/arch/um/include/shared/longjmp.h index e860bc584..e860bc584 100644 --- a/arch/um/include/longjmp.h +++ b/arch/um/include/shared/longjmp.h diff --git a/arch/um/include/mconsole.h b/arch/um/include/shared/mconsole.h index c139ae1..c139ae1 100644 --- a/arch/um/include/mconsole.h +++ b/arch/um/include/shared/mconsole.h diff --git a/arch/um/include/mconsole_kern.h b/arch/um/include/shared/mconsole_kern.h index d2fe07e..d2fe07e 100644 --- a/arch/um/include/mconsole_kern.h +++ b/arch/um/include/shared/mconsole_kern.h diff --git a/arch/um/include/mem.h b/arch/um/include/shared/mem.h index 5cd40e9..5cd40e9 100644 --- a/arch/um/include/mem.h +++ b/arch/um/include/shared/mem.h diff --git a/arch/um/include/mem_kern.h b/arch/um/include/shared/mem_kern.h index cb7e196..cb7e196 100644 --- a/arch/um/include/mem_kern.h +++ b/arch/um/include/shared/mem_kern.h diff --git a/arch/um/include/mem_user.h b/arch/um/include/shared/mem_user.h index 46384ac..46384ac 100644 --- a/arch/um/include/mem_user.h +++ b/arch/um/include/shared/mem_user.h diff --git a/arch/um/include/net_kern.h b/arch/um/include/shared/net_kern.h index d843c79..d843c79 100644 --- a/arch/um/include/net_kern.h +++ b/arch/um/include/shared/net_kern.h diff --git a/arch/um/include/net_user.h b/arch/um/include/shared/net_user.h index 63bee15..63bee15 100644 --- a/arch/um/include/net_user.h +++ b/arch/um/include/shared/net_user.h diff --git a/arch/um/include/os.h b/arch/um/include/shared/os.h index db5be46..2aaffa0 100644 --- a/arch/um/include/os.h +++ b/arch/um/include/shared/os.h @@ -11,7 +11,7 @@ #include "longjmp.h" #include "mm_id.h" #include "sysdep/tls.h" -#include "../os/include/file.h" +#include "../../os/include/file.h" #define CATCH_EINTR(expr) while ((errno = 0, ((expr) < 0)) && (errno == EINTR)) diff --git a/arch/um/include/process.h b/arch/um/include/shared/process.h index bb873a5..bb873a5 100644 --- a/arch/um/include/process.h +++ b/arch/um/include/shared/process.h diff --git a/arch/um/include/ptrace_user.h b/arch/um/include/shared/ptrace_user.h index 4bce6e0..4bce6e0 100644 --- a/arch/um/include/ptrace_user.h +++ b/arch/um/include/shared/ptrace_user.h diff --git a/arch/um/include/registers.h b/arch/um/include/shared/registers.h index b0b4589..b0b4589 100644 --- a/arch/um/include/registers.h +++ b/arch/um/include/shared/registers.h diff --git a/arch/um/include/sigcontext.h b/arch/um/include/shared/sigcontext.h index 59816ca..59816ca 100644 --- a/arch/um/include/sigcontext.h +++ b/arch/um/include/shared/sigcontext.h diff --git a/arch/um/include/sigio.h b/arch/um/include/shared/sigio.h index 434f1a9..434f1a9 100644 --- a/arch/um/include/sigio.h +++ b/arch/um/include/shared/sigio.h diff --git a/arch/um/include/skas/mm_id.h b/arch/um/include/shared/skas/mm_id.h index 48dd098..48dd098 100644 --- a/arch/um/include/skas/mm_id.h +++ b/arch/um/include/shared/skas/mm_id.h diff --git a/arch/um/include/skas/proc_mm.h b/arch/um/include/shared/skas/proc_mm.h index 9028092..9028092 100644 --- a/arch/um/include/skas/proc_mm.h +++ b/arch/um/include/shared/skas/proc_mm.h diff --git a/arch/um/include/skas/skas.h b/arch/um/include/shared/skas/skas.h index 64d2c74..64d2c74 100644 --- a/arch/um/include/skas/skas.h +++ b/arch/um/include/shared/skas/skas.h diff --git a/arch/um/include/skas/stub-data.h b/arch/um/include/shared/skas/stub-data.h index f6ed92c..f6ed92c 100644 --- a/arch/um/include/skas/stub-data.h +++ b/arch/um/include/shared/skas/stub-data.h diff --git a/arch/um/include/skas_ptrace.h b/arch/um/include/shared/skas_ptrace.h index 3d31bba..3d31bba 100644 --- a/arch/um/include/skas_ptrace.h +++ b/arch/um/include/shared/skas_ptrace.h diff --git a/arch/um/include/skas_ptregs.h b/arch/um/include/shared/skas_ptregs.h index 73db19e..73db19e 100644 --- a/arch/um/include/skas_ptregs.h +++ b/arch/um/include/shared/skas_ptregs.h diff --git a/arch/um/include/syscall.h b/arch/um/include/shared/syscall.h index dda1df9..dda1df9 100644 --- a/arch/um/include/syscall.h +++ b/arch/um/include/shared/syscall.h diff --git a/arch/um/include/sysdep-i386/archsetjmp.h b/arch/um/include/shared/sysdep-i386/archsetjmp.h index 0f31208..0f31208 100644 --- a/arch/um/include/sysdep-i386/archsetjmp.h +++ b/arch/um/include/shared/sysdep-i386/archsetjmp.h diff --git a/arch/um/include/sysdep-i386/barrier.h b/arch/um/include/shared/sysdep-i386/barrier.h index b58d52c..b58d52c 100644 --- a/arch/um/include/sysdep-i386/barrier.h +++ b/arch/um/include/shared/sysdep-i386/barrier.h diff --git a/arch/um/include/sysdep-i386/checksum.h b/arch/um/include/shared/sysdep-i386/checksum.h index 0cb4645..0cb4645 100644 --- a/arch/um/include/sysdep-i386/checksum.h +++ b/arch/um/include/shared/sysdep-i386/checksum.h diff --git a/arch/um/include/sysdep-i386/faultinfo.h b/arch/um/include/shared/sysdep-i386/faultinfo.h index db437cc..db437cc 100644 --- a/arch/um/include/sysdep-i386/faultinfo.h +++ b/arch/um/include/shared/sysdep-i386/faultinfo.h diff --git a/arch/um/include/sysdep-i386/kernel-offsets.h b/arch/um/include/shared/sysdep-i386/kernel-offsets.h index 5868526..5868526 100644 --- a/arch/um/include/sysdep-i386/kernel-offsets.h +++ b/arch/um/include/shared/sysdep-i386/kernel-offsets.h diff --git a/arch/um/include/sysdep-i386/ptrace.h b/arch/um/include/shared/sysdep-i386/ptrace.h index 11c0896..11c0896 100644 --- a/arch/um/include/sysdep-i386/ptrace.h +++ b/arch/um/include/shared/sysdep-i386/ptrace.h diff --git a/arch/um/include/sysdep-i386/ptrace_user.h b/arch/um/include/shared/sysdep-i386/ptrace_user.h index ef56247..ef56247 100644 --- a/arch/um/include/sysdep-i386/ptrace_user.h +++ b/arch/um/include/shared/sysdep-i386/ptrace_user.h diff --git a/arch/um/include/sysdep-i386/sc.h b/arch/um/include/shared/sysdep-i386/sc.h index c57d178..c57d178 100644 --- a/arch/um/include/sysdep-i386/sc.h +++ b/arch/um/include/shared/sysdep-i386/sc.h diff --git a/arch/um/include/sysdep-i386/sigcontext.h b/arch/um/include/shared/sysdep-i386/sigcontext.h index f583c87..f583c87 100644 --- a/arch/um/include/sysdep-i386/sigcontext.h +++ b/arch/um/include/shared/sysdep-i386/sigcontext.h diff --git a/arch/um/include/sysdep-i386/skas_ptrace.h b/arch/um/include/shared/sysdep-i386/skas_ptrace.h index e27b8a7..e27b8a7 100644 --- a/arch/um/include/sysdep-i386/skas_ptrace.h +++ b/arch/um/include/shared/sysdep-i386/skas_ptrace.h diff --git a/arch/um/include/sysdep-i386/stub.h b/arch/um/include/shared/sysdep-i386/stub.h index 8c097b8..8c097b8 100644 --- a/arch/um/include/sysdep-i386/stub.h +++ b/arch/um/include/shared/sysdep-i386/stub.h diff --git a/arch/um/include/sysdep-i386/syscalls.h b/arch/um/include/shared/sysdep-i386/syscalls.h index 9056981..9056981 100644 --- a/arch/um/include/sysdep-i386/syscalls.h +++ b/arch/um/include/shared/sysdep-i386/syscalls.h diff --git a/arch/um/include/sysdep-i386/tls.h b/arch/um/include/shared/sysdep-i386/tls.h index 918fd3c..918fd3c 100644 --- a/arch/um/include/sysdep-i386/tls.h +++ b/arch/um/include/shared/sysdep-i386/tls.h diff --git a/arch/um/include/sysdep-ia64/ptrace.h b/arch/um/include/shared/sysdep-ia64/ptrace.h index 42dd8fb..42dd8fb 100644 --- a/arch/um/include/sysdep-ia64/ptrace.h +++ b/arch/um/include/shared/sysdep-ia64/ptrace.h diff --git a/arch/um/include/sysdep-ia64/sigcontext.h b/arch/um/include/shared/sysdep-ia64/sigcontext.h index f15fb25..f15fb25 100644 --- a/arch/um/include/sysdep-ia64/sigcontext.h +++ b/arch/um/include/shared/sysdep-ia64/sigcontext.h diff --git a/arch/um/include/sysdep-ia64/skas_ptrace.h b/arch/um/include/shared/sysdep-ia64/skas_ptrace.h index 25a38e7..25a38e7 100644 --- a/arch/um/include/sysdep-ia64/skas_ptrace.h +++ b/arch/um/include/shared/sysdep-ia64/skas_ptrace.h diff --git a/arch/um/include/sysdep-ia64/syscalls.h b/arch/um/include/shared/sysdep-ia64/syscalls.h index 4a1f46e..4a1f46e 100644 --- a/arch/um/include/sysdep-ia64/syscalls.h +++ b/arch/um/include/shared/sysdep-ia64/syscalls.h diff --git a/arch/um/include/sysdep-ppc/ptrace.h b/arch/um/include/shared/sysdep-ppc/ptrace.h index df2397d..df2397d 100644 --- a/arch/um/include/sysdep-ppc/ptrace.h +++ b/arch/um/include/shared/sysdep-ppc/ptrace.h diff --git a/arch/um/include/sysdep-ppc/sigcontext.h b/arch/um/include/shared/sysdep-ppc/sigcontext.h index f20d965..f20d965 100644 --- a/arch/um/include/sysdep-ppc/sigcontext.h +++ b/arch/um/include/shared/sysdep-ppc/sigcontext.h diff --git a/arch/um/include/sysdep-ppc/skas_ptrace.h b/arch/um/include/shared/sysdep-ppc/skas_ptrace.h index d9fbbac..d9fbbac 100644 --- a/arch/um/include/sysdep-ppc/skas_ptrace.h +++ b/arch/um/include/shared/sysdep-ppc/skas_ptrace.h diff --git a/arch/um/include/sysdep-ppc/syscalls.h b/arch/um/include/shared/sysdep-ppc/syscalls.h index 679df35..679df35 100644 --- a/arch/um/include/sysdep-ppc/syscalls.h +++ b/arch/um/include/shared/sysdep-ppc/syscalls.h diff --git a/arch/um/include/sysdep-x86_64/archsetjmp.h b/arch/um/include/shared/sysdep-x86_64/archsetjmp.h index 2af8f12..2af8f12 100644 --- a/arch/um/include/sysdep-x86_64/archsetjmp.h +++ b/arch/um/include/shared/sysdep-x86_64/archsetjmp.h diff --git a/arch/um/include/sysdep-x86_64/barrier.h b/arch/um/include/shared/sysdep-x86_64/barrier.h index 7b610be..7b610be 100644 --- a/arch/um/include/sysdep-x86_64/barrier.h +++ b/arch/um/include/shared/sysdep-x86_64/barrier.h diff --git a/arch/um/include/sysdep-x86_64/checksum.h b/arch/um/include/shared/sysdep-x86_64/checksum.h index a5be903..a5be903 100644 --- a/arch/um/include/sysdep-x86_64/checksum.h +++ b/arch/um/include/shared/sysdep-x86_64/checksum.h diff --git a/arch/um/include/sysdep-x86_64/faultinfo.h b/arch/um/include/shared/sysdep-x86_64/faultinfo.h index cb917b0..cb917b0 100644 --- a/arch/um/include/sysdep-x86_64/faultinfo.h +++ b/arch/um/include/shared/sysdep-x86_64/faultinfo.h diff --git a/arch/um/include/sysdep-x86_64/kernel-offsets.h b/arch/um/include/shared/sysdep-x86_64/kernel-offsets.h index a307237..a307237 100644 --- a/arch/um/include/sysdep-x86_64/kernel-offsets.h +++ b/arch/um/include/shared/sysdep-x86_64/kernel-offsets.h diff --git a/arch/um/include/sysdep-x86_64/ptrace.h b/arch/um/include/shared/sysdep-x86_64/ptrace.h index 9ea44d1..9ea44d1 100644 --- a/arch/um/include/sysdep-x86_64/ptrace.h +++ b/arch/um/include/shared/sysdep-x86_64/ptrace.h diff --git a/arch/um/include/sysdep-x86_64/ptrace_user.h b/arch/um/include/shared/sysdep-x86_64/ptrace_user.h index 4dbccdb..4dbccdb 100644 --- a/arch/um/include/sysdep-x86_64/ptrace_user.h +++ b/arch/um/include/shared/sysdep-x86_64/ptrace_user.h diff --git a/arch/um/include/sysdep-x86_64/sc.h b/arch/um/include/shared/sysdep-x86_64/sc.h index 8aee45b..8aee45b 100644 --- a/arch/um/include/sysdep-x86_64/sc.h +++ b/arch/um/include/shared/sysdep-x86_64/sc.h diff --git a/arch/um/include/sysdep-x86_64/sigcontext.h b/arch/um/include/shared/sysdep-x86_64/sigcontext.h index 0155133..0155133 100644 --- a/arch/um/include/sysdep-x86_64/sigcontext.h +++ b/arch/um/include/shared/sysdep-x86_64/sigcontext.h diff --git a/arch/um/include/sysdep-x86_64/skas_ptrace.h b/arch/um/include/shared/sysdep-x86_64/skas_ptrace.h index 95db4be7..95db4be7 100644 --- a/arch/um/include/sysdep-x86_64/skas_ptrace.h +++ b/arch/um/include/shared/sysdep-x86_64/skas_ptrace.h diff --git a/arch/um/include/sysdep-x86_64/stub.h b/arch/um/include/shared/sysdep-x86_64/stub.h index 655f9c2..655f9c2 100644 --- a/arch/um/include/sysdep-x86_64/stub.h +++ b/arch/um/include/shared/sysdep-x86_64/stub.h diff --git a/arch/um/include/sysdep-x86_64/syscalls.h b/arch/um/include/shared/sysdep-x86_64/syscalls.h index 7cfb0b08..7cfb0b08 100644 --- a/arch/um/include/sysdep-x86_64/syscalls.h +++ b/arch/um/include/shared/sysdep-x86_64/syscalls.h diff --git a/arch/um/include/sysdep-x86_64/tls.h b/arch/um/include/shared/sysdep-x86_64/tls.h index 35f19f2..35f19f2 100644 --- a/arch/um/include/sysdep-x86_64/tls.h +++ b/arch/um/include/shared/sysdep-x86_64/tls.h diff --git a/arch/um/include/sysrq.h b/arch/um/include/shared/sysrq.h index c8d332b..c8d332b 100644 --- a/arch/um/include/sysrq.h +++ b/arch/um/include/shared/sysrq.h diff --git a/arch/um/include/task.h b/arch/um/include/shared/task.h index 3fe726b..3fe726b 100644 --- a/arch/um/include/task.h +++ b/arch/um/include/shared/task.h diff --git a/arch/um/include/tlb.h b/arch/um/include/shared/tlb.h index ecd2265..ecd2265 100644 --- a/arch/um/include/tlb.h +++ b/arch/um/include/shared/tlb.h diff --git a/arch/um/include/ubd_user.h b/arch/um/include/shared/ubd_user.h index bb66517..bb66517 100644 --- a/arch/um/include/ubd_user.h +++ b/arch/um/include/shared/ubd_user.h diff --git a/arch/um/include/um_malloc.h b/arch/um/include/shared/um_malloc.h index c554d70..c554d70 100644 --- a/arch/um/include/um_malloc.h +++ b/arch/um/include/shared/um_malloc.h diff --git a/arch/um/include/um_mmu.h b/arch/um/include/shared/um_mmu.h index f575ff9..f575ff9 100644 --- a/arch/um/include/um_mmu.h +++ b/arch/um/include/shared/um_mmu.h diff --git a/arch/um/include/um_uaccess.h b/arch/um/include/shared/um_uaccess.h index 45c0499..45c0499 100644 --- a/arch/um/include/um_uaccess.h +++ b/arch/um/include/shared/um_uaccess.h diff --git a/arch/um/include/user.h b/arch/um/include/shared/user.h index 1723fac..1723fac 100644 --- a/arch/um/include/user.h +++ b/arch/um/include/shared/user.h |