From: Al Viro Date: Sun, 17 Aug 2008 17:48:37 +0000 (-0400) Subject: x86, um: take arch/um/include/* out of the way X-Git-Tag: v2.6.28-rc1~25^2~25 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8569c9140bd41089f9b6be8837ca421102714a90;p=linux-2.6-omap-h63xx.git 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 Signed-off-by: H. Peter Anvin --- diff --git a/arch/um/Makefile b/arch/um/Makefile index ca40397017b..88c5b0a5277 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 similarity index 100% rename from arch/um/include/aio.h rename to arch/um/include/shared/aio.h diff --git a/arch/um/include/arch.h b/arch/um/include/shared/arch.h similarity index 100% rename from arch/um/include/arch.h rename to arch/um/include/shared/arch.h diff --git a/arch/um/include/as-layout.h b/arch/um/include/shared/as-layout.h similarity index 100% rename from arch/um/include/as-layout.h rename to arch/um/include/shared/as-layout.h diff --git a/arch/um/include/chan_kern.h b/arch/um/include/shared/chan_kern.h similarity index 100% rename from arch/um/include/chan_kern.h rename to arch/um/include/shared/chan_kern.h diff --git a/arch/um/include/chan_user.h b/arch/um/include/shared/chan_user.h similarity index 100% rename from arch/um/include/chan_user.h rename to arch/um/include/shared/chan_user.h diff --git a/arch/um/include/common-offsets.h b/arch/um/include/shared/common-offsets.h similarity index 100% rename from arch/um/include/common-offsets.h rename to arch/um/include/shared/common-offsets.h diff --git a/arch/um/include/elf_user.h b/arch/um/include/shared/elf_user.h similarity index 100% rename from arch/um/include/elf_user.h rename to arch/um/include/shared/elf_user.h diff --git a/arch/um/include/frame_kern.h b/arch/um/include/shared/frame_kern.h similarity index 100% rename from arch/um/include/frame_kern.h rename to arch/um/include/shared/frame_kern.h diff --git a/arch/um/include/init.h b/arch/um/include/shared/init.h similarity index 100% rename from arch/um/include/init.h rename to arch/um/include/shared/init.h diff --git a/arch/um/include/initrd.h b/arch/um/include/shared/initrd.h similarity index 100% rename from arch/um/include/initrd.h rename to arch/um/include/shared/initrd.h diff --git a/arch/um/include/irq_kern.h b/arch/um/include/shared/irq_kern.h similarity index 100% rename from arch/um/include/irq_kern.h rename to arch/um/include/shared/irq_kern.h diff --git a/arch/um/include/irq_user.h b/arch/um/include/shared/irq_user.h similarity index 100% rename from arch/um/include/irq_user.h rename to arch/um/include/shared/irq_user.h diff --git a/arch/um/include/kern.h b/arch/um/include/shared/kern.h similarity index 100% rename from arch/um/include/kern.h rename to arch/um/include/shared/kern.h diff --git a/arch/um/include/kern_util.h b/arch/um/include/shared/kern_util.h similarity index 100% rename from arch/um/include/kern_util.h rename to arch/um/include/shared/kern_util.h diff --git a/arch/um/include/line.h b/arch/um/include/shared/line.h similarity index 100% rename from arch/um/include/line.h rename to arch/um/include/shared/line.h diff --git a/arch/um/include/longjmp.h b/arch/um/include/shared/longjmp.h similarity index 100% rename from arch/um/include/longjmp.h rename to arch/um/include/shared/longjmp.h diff --git a/arch/um/include/mconsole.h b/arch/um/include/shared/mconsole.h similarity index 100% rename from arch/um/include/mconsole.h rename to arch/um/include/shared/mconsole.h diff --git a/arch/um/include/mconsole_kern.h b/arch/um/include/shared/mconsole_kern.h similarity index 100% rename from arch/um/include/mconsole_kern.h rename to arch/um/include/shared/mconsole_kern.h diff --git a/arch/um/include/mem.h b/arch/um/include/shared/mem.h similarity index 100% rename from arch/um/include/mem.h rename to arch/um/include/shared/mem.h diff --git a/arch/um/include/mem_kern.h b/arch/um/include/shared/mem_kern.h similarity index 100% rename from arch/um/include/mem_kern.h rename to arch/um/include/shared/mem_kern.h diff --git a/arch/um/include/mem_user.h b/arch/um/include/shared/mem_user.h similarity index 100% rename from arch/um/include/mem_user.h rename to arch/um/include/shared/mem_user.h diff --git a/arch/um/include/net_kern.h b/arch/um/include/shared/net_kern.h similarity index 100% rename from arch/um/include/net_kern.h rename to arch/um/include/shared/net_kern.h diff --git a/arch/um/include/net_user.h b/arch/um/include/shared/net_user.h similarity index 100% rename from arch/um/include/net_user.h rename to arch/um/include/shared/net_user.h diff --git a/arch/um/include/os.h b/arch/um/include/shared/os.h similarity index 99% rename from arch/um/include/os.h rename to arch/um/include/shared/os.h index db5be46e3e1..2aaffa04fc8 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 similarity index 100% rename from arch/um/include/process.h rename to arch/um/include/shared/process.h diff --git a/arch/um/include/ptrace_user.h b/arch/um/include/shared/ptrace_user.h similarity index 100% rename from arch/um/include/ptrace_user.h rename to arch/um/include/shared/ptrace_user.h diff --git a/arch/um/include/registers.h b/arch/um/include/shared/registers.h similarity index 100% rename from arch/um/include/registers.h rename to arch/um/include/shared/registers.h diff --git a/arch/um/include/sigcontext.h b/arch/um/include/shared/sigcontext.h similarity index 100% rename from arch/um/include/sigcontext.h rename to arch/um/include/shared/sigcontext.h diff --git a/arch/um/include/sigio.h b/arch/um/include/shared/sigio.h similarity index 100% rename from arch/um/include/sigio.h rename to 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 similarity index 100% rename from arch/um/include/skas/mm_id.h rename to 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 similarity index 100% rename from arch/um/include/skas/proc_mm.h rename to 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 similarity index 100% rename from arch/um/include/skas/skas.h rename to 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 similarity index 100% rename from arch/um/include/skas/stub-data.h rename to 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 similarity index 100% rename from arch/um/include/skas_ptrace.h rename to arch/um/include/shared/skas_ptrace.h diff --git a/arch/um/include/skas_ptregs.h b/arch/um/include/shared/skas_ptregs.h similarity index 100% rename from arch/um/include/skas_ptregs.h rename to arch/um/include/shared/skas_ptregs.h diff --git a/arch/um/include/syscall.h b/arch/um/include/shared/syscall.h similarity index 100% rename from arch/um/include/syscall.h rename to 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 similarity index 100% rename from arch/um/include/sysdep-i386/archsetjmp.h rename to 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 similarity index 100% rename from arch/um/include/sysdep-i386/barrier.h rename to 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 similarity index 100% rename from arch/um/include/sysdep-i386/checksum.h rename to 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 similarity index 100% rename from arch/um/include/sysdep-i386/faultinfo.h rename to 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 similarity index 100% rename from arch/um/include/sysdep-i386/kernel-offsets.h rename to 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 similarity index 100% rename from arch/um/include/sysdep-i386/ptrace.h rename to 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 similarity index 100% rename from arch/um/include/sysdep-i386/ptrace_user.h rename to 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 similarity index 100% rename from arch/um/include/sysdep-i386/sc.h rename to 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 similarity index 100% rename from arch/um/include/sysdep-i386/sigcontext.h rename to 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 similarity index 100% rename from arch/um/include/sysdep-i386/skas_ptrace.h rename to 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 similarity index 100% rename from arch/um/include/sysdep-i386/stub.h rename to 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 similarity index 100% rename from arch/um/include/sysdep-i386/syscalls.h rename to 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 similarity index 100% rename from arch/um/include/sysdep-i386/tls.h rename to 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 similarity index 100% rename from arch/um/include/sysdep-ia64/ptrace.h rename to 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 similarity index 100% rename from arch/um/include/sysdep-ia64/sigcontext.h rename to 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 similarity index 100% rename from arch/um/include/sysdep-ia64/skas_ptrace.h rename to 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 similarity index 100% rename from arch/um/include/sysdep-ia64/syscalls.h rename to 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 similarity index 100% rename from arch/um/include/sysdep-ppc/ptrace.h rename to 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 similarity index 100% rename from arch/um/include/sysdep-ppc/sigcontext.h rename to 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 similarity index 100% rename from arch/um/include/sysdep-ppc/skas_ptrace.h rename to 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 similarity index 100% rename from arch/um/include/sysdep-ppc/syscalls.h rename to 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 similarity index 100% rename from arch/um/include/sysdep-x86_64/archsetjmp.h rename to 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 similarity index 100% rename from arch/um/include/sysdep-x86_64/barrier.h rename to 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 similarity index 100% rename from arch/um/include/sysdep-x86_64/checksum.h rename to 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 similarity index 100% rename from arch/um/include/sysdep-x86_64/faultinfo.h rename to 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 similarity index 100% rename from arch/um/include/sysdep-x86_64/kernel-offsets.h rename to 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 similarity index 100% rename from arch/um/include/sysdep-x86_64/ptrace.h rename to 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 similarity index 100% rename from arch/um/include/sysdep-x86_64/ptrace_user.h rename to 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 similarity index 100% rename from arch/um/include/sysdep-x86_64/sc.h rename to 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 similarity index 100% rename from arch/um/include/sysdep-x86_64/sigcontext.h rename to 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 similarity index 100% rename from arch/um/include/sysdep-x86_64/skas_ptrace.h rename to 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 similarity index 100% rename from arch/um/include/sysdep-x86_64/stub.h rename to 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 similarity index 100% rename from arch/um/include/sysdep-x86_64/syscalls.h rename to 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 similarity index 100% rename from arch/um/include/sysdep-x86_64/tls.h rename to arch/um/include/shared/sysdep-x86_64/tls.h diff --git a/arch/um/include/sysrq.h b/arch/um/include/shared/sysrq.h similarity index 100% rename from arch/um/include/sysrq.h rename to arch/um/include/shared/sysrq.h diff --git a/arch/um/include/task.h b/arch/um/include/shared/task.h similarity index 100% rename from arch/um/include/task.h rename to arch/um/include/shared/task.h diff --git a/arch/um/include/tlb.h b/arch/um/include/shared/tlb.h similarity index 100% rename from arch/um/include/tlb.h rename to arch/um/include/shared/tlb.h diff --git a/arch/um/include/ubd_user.h b/arch/um/include/shared/ubd_user.h similarity index 100% rename from arch/um/include/ubd_user.h rename to arch/um/include/shared/ubd_user.h diff --git a/arch/um/include/um_malloc.h b/arch/um/include/shared/um_malloc.h similarity index 100% rename from arch/um/include/um_malloc.h rename to arch/um/include/shared/um_malloc.h diff --git a/arch/um/include/um_mmu.h b/arch/um/include/shared/um_mmu.h similarity index 100% rename from arch/um/include/um_mmu.h rename to arch/um/include/shared/um_mmu.h diff --git a/arch/um/include/um_uaccess.h b/arch/um/include/shared/um_uaccess.h similarity index 100% rename from arch/um/include/um_uaccess.h rename to arch/um/include/shared/um_uaccess.h diff --git a/arch/um/include/user.h b/arch/um/include/shared/user.h similarity index 100% rename from arch/um/include/user.h rename to arch/um/include/shared/user.h