summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorAl Viro <viro@ftp.linux.org.uk>2011-08-18 20:06:39 +0100
committerRichard Weinberger <richard@nod.at>2011-11-02 14:15:05 +0100
commit5c48b108ecbf6505d929e64d50dace13ac2bdf34 (patch)
tree016904f84fbe05aa301c5cdfe712d90f6bb828fe /arch
parent7bbe7204e93734fe79d8aac3e08a7cb4624b5004 (diff)
um: take arch/um/sys-x86 to arch/x86/um
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch')
-rw-r--r--arch/um/Makefile22
-rw-r--r--arch/um/os-Linux/Makefile2
-rw-r--r--arch/um/scripts/Makefile.rules5
-rw-r--r--arch/x86/Makefile.um (renamed from arch/um/Makefile-x86)2
-rw-r--r--arch/x86/um/Kconfig (renamed from arch/um/Kconfig.x86)0
-rw-r--r--arch/x86/um/Makefile (renamed from arch/um/sys-x86/Makefile)16
-rw-r--r--arch/x86/um/asm/arch_hweight.h (renamed from arch/um/sys-x86/asm/arch_hweight.h)0
-rw-r--r--arch/x86/um/asm/archparam.h (renamed from arch/um/sys-x86/asm/archparam.h)0
-rw-r--r--arch/x86/um/asm/checksum.h (renamed from arch/um/sys-x86/asm/checksum.h)0
-rw-r--r--arch/x86/um/asm/checksum_32.h (renamed from arch/um/sys-x86/asm/checksum_32.h)0
-rw-r--r--arch/x86/um/asm/checksum_64.h (renamed from arch/um/sys-x86/asm/checksum_64.h)0
-rw-r--r--arch/x86/um/asm/elf.h (renamed from arch/um/sys-x86/asm/elf.h)0
-rw-r--r--arch/x86/um/asm/module.h (renamed from arch/um/sys-x86/asm/module.h)0
-rw-r--r--arch/x86/um/asm/processor.h (renamed from arch/um/sys-x86/asm/processor.h)0
-rw-r--r--arch/x86/um/asm/processor_32.h (renamed from arch/um/sys-x86/asm/processor_32.h)0
-rw-r--r--arch/x86/um/asm/processor_64.h (renamed from arch/um/sys-x86/asm/processor_64.h)0
-rw-r--r--arch/x86/um/asm/ptrace.h (renamed from arch/um/sys-x86/asm/ptrace.h)0
-rw-r--r--arch/x86/um/asm/ptrace_32.h (renamed from arch/um/sys-x86/asm/ptrace_32.h)0
-rw-r--r--arch/x86/um/asm/ptrace_64.h (renamed from arch/um/sys-x86/asm/ptrace_64.h)0
-rw-r--r--arch/x86/um/asm/system.h (renamed from arch/um/sys-x86/asm/system.h)0
-rw-r--r--arch/x86/um/asm/vm-flags.h (renamed from arch/um/sys-x86/asm/vm-flags.h)0
-rw-r--r--arch/x86/um/bug.c (renamed from arch/um/sys-x86/bug.c)0
-rw-r--r--arch/x86/um/bugs_32.c (renamed from arch/um/sys-x86/bugs_32.c)0
-rw-r--r--arch/x86/um/bugs_64.c (renamed from arch/um/sys-x86/bugs_64.c)0
-rw-r--r--arch/x86/um/checksum_32.S (renamed from arch/um/sys-x86/checksum_32.S)0
-rw-r--r--arch/x86/um/delay_32.c (renamed from arch/um/sys-x86/delay_32.c)0
-rw-r--r--arch/x86/um/delay_64.c (renamed from arch/um/sys-x86/delay_64.c)0
-rw-r--r--arch/x86/um/elfcore.c (renamed from arch/um/sys-x86/elfcore.c)0
-rw-r--r--arch/x86/um/fault.c (renamed from arch/um/sys-x86/fault.c)0
-rw-r--r--arch/x86/um/ksyms.c (renamed from arch/um/sys-x86/ksyms.c)0
-rw-r--r--arch/x86/um/ldt.c (renamed from arch/um/sys-x86/ldt.c)0
-rw-r--r--arch/x86/um/mem_32.c (renamed from arch/um/sys-x86/mem_32.c)0
-rw-r--r--arch/x86/um/mem_64.c (renamed from arch/um/sys-x86/mem_64.c)0
-rw-r--r--arch/x86/um/os-Linux/Makefile (renamed from arch/um/os-Linux/sys-x86/Makefile)0
-rw-r--r--arch/x86/um/os-Linux/mcontext.c (renamed from arch/um/os-Linux/sys-x86/mcontext.c)0
-rw-r--r--arch/x86/um/os-Linux/prctl.c (renamed from arch/um/os-Linux/sys-x86/prctl.c)0
-rw-r--r--arch/x86/um/os-Linux/registers.c (renamed from arch/um/os-Linux/sys-x86/registers.c)0
-rw-r--r--arch/x86/um/os-Linux/task_size.c (renamed from arch/um/os-Linux/sys-x86/task_size.c)0
-rw-r--r--arch/x86/um/os-Linux/tls.c (renamed from arch/um/os-Linux/sys-x86/tls.c)0
-rw-r--r--arch/x86/um/ptrace_32.c (renamed from arch/um/sys-x86/ptrace_32.c)0
-rw-r--r--arch/x86/um/ptrace_64.c (renamed from arch/um/sys-x86/ptrace_64.c)0
-rw-r--r--arch/x86/um/ptrace_user.c (renamed from arch/um/sys-x86/ptrace_user.c)0
-rw-r--r--arch/x86/um/setjmp_32.S (renamed from arch/um/sys-x86/setjmp_32.S)0
-rw-r--r--arch/x86/um/setjmp_64.S (renamed from arch/um/sys-x86/setjmp_64.S)0
-rw-r--r--arch/x86/um/shared/sysdep/archsetjmp.h (renamed from arch/um/sys-x86/shared/sysdep/archsetjmp.h)0
-rw-r--r--arch/x86/um/shared/sysdep/archsetjmp_32.h (renamed from arch/um/sys-x86/shared/sysdep/archsetjmp_32.h)0
-rw-r--r--arch/x86/um/shared/sysdep/archsetjmp_64.h (renamed from arch/um/sys-x86/shared/sysdep/archsetjmp_64.h)0
-rw-r--r--arch/x86/um/shared/sysdep/faultinfo.h (renamed from arch/um/sys-x86/shared/sysdep/faultinfo.h)0
-rw-r--r--arch/x86/um/shared/sysdep/faultinfo_32.h (renamed from arch/um/sys-x86/shared/sysdep/faultinfo_32.h)0
-rw-r--r--arch/x86/um/shared/sysdep/faultinfo_64.h (renamed from arch/um/sys-x86/shared/sysdep/faultinfo_64.h)0
-rw-r--r--arch/x86/um/shared/sysdep/host_ldt.h (renamed from arch/um/sys-x86/shared/sysdep/host_ldt.h)0
-rw-r--r--arch/x86/um/shared/sysdep/host_ldt_32.h (renamed from arch/um/sys-x86/shared/sysdep/host_ldt_32.h)0
-rw-r--r--arch/x86/um/shared/sysdep/host_ldt_64.h (renamed from arch/um/sys-x86/shared/sysdep/host_ldt_64.h)0
-rw-r--r--arch/x86/um/shared/sysdep/kernel-offsets.h (renamed from arch/um/sys-x86/shared/sysdep/kernel-offsets.h)0
-rw-r--r--arch/x86/um/shared/sysdep/mcontext.h (renamed from arch/um/sys-x86/shared/sysdep/mcontext.h)0
-rw-r--r--arch/x86/um/shared/sysdep/ptrace.h (renamed from arch/um/sys-x86/shared/sysdep/ptrace.h)0
-rw-r--r--arch/x86/um/shared/sysdep/ptrace_32.h (renamed from arch/um/sys-x86/shared/sysdep/ptrace_32.h)0
-rw-r--r--arch/x86/um/shared/sysdep/ptrace_64.h (renamed from arch/um/sys-x86/shared/sysdep/ptrace_64.h)0
-rw-r--r--arch/x86/um/shared/sysdep/ptrace_user.h (renamed from arch/um/sys-x86/shared/sysdep/ptrace_user.h)0
-rw-r--r--arch/x86/um/shared/sysdep/ptrace_user_32.h (renamed from arch/um/sys-x86/shared/sysdep/ptrace_user_32.h)0
-rw-r--r--arch/x86/um/shared/sysdep/ptrace_user_64.h (renamed from arch/um/sys-x86/shared/sysdep/ptrace_user_64.h)0
-rw-r--r--arch/x86/um/shared/sysdep/skas_ptrace.h (renamed from arch/um/sys-x86/shared/sysdep/skas_ptrace.h)0
-rw-r--r--arch/x86/um/shared/sysdep/stub.h (renamed from arch/um/sys-x86/shared/sysdep/stub.h)0
-rw-r--r--arch/x86/um/shared/sysdep/stub_32.h (renamed from arch/um/sys-x86/shared/sysdep/stub_32.h)0
-rw-r--r--arch/x86/um/shared/sysdep/stub_64.h (renamed from arch/um/sys-x86/shared/sysdep/stub_64.h)0
-rw-r--r--arch/x86/um/shared/sysdep/syscalls.h (renamed from arch/um/sys-x86/shared/sysdep/syscalls.h)0
-rw-r--r--arch/x86/um/shared/sysdep/syscalls_32.h (renamed from arch/um/sys-x86/shared/sysdep/syscalls_32.h)0
-rw-r--r--arch/x86/um/shared/sysdep/syscalls_64.h (renamed from arch/um/sys-x86/shared/sysdep/syscalls_64.h)0
-rw-r--r--arch/x86/um/shared/sysdep/tls.h (renamed from arch/um/sys-x86/shared/sysdep/tls.h)0
-rw-r--r--arch/x86/um/shared/sysdep/tls_32.h (renamed from arch/um/sys-x86/shared/sysdep/tls_32.h)0
-rw-r--r--arch/x86/um/shared/sysdep/tls_64.h (renamed from arch/um/sys-x86/shared/sysdep/tls_64.h)0
-rw-r--r--arch/x86/um/signal_32.c (renamed from arch/um/sys-x86/signal_32.c)0
-rw-r--r--arch/x86/um/signal_64.c (renamed from arch/um/sys-x86/signal_64.c)0
-rw-r--r--arch/x86/um/stub_32.S (renamed from arch/um/sys-x86/stub_32.S)0
-rw-r--r--arch/x86/um/stub_64.S (renamed from arch/um/sys-x86/stub_64.S)0
-rw-r--r--arch/x86/um/stub_segv.c (renamed from arch/um/sys-x86/stub_segv.c)0
-rw-r--r--arch/x86/um/sys_call_table_32.S (renamed from arch/um/sys-x86/sys_call_table_32.S)0
-rw-r--r--arch/x86/um/sys_call_table_64.c (renamed from arch/um/sys-x86/sys_call_table_64.c)0
-rw-r--r--arch/x86/um/syscalls_32.c (renamed from arch/um/sys-x86/syscalls_32.c)0
-rw-r--r--arch/x86/um/syscalls_64.c (renamed from arch/um/sys-x86/syscalls_64.c)0
-rw-r--r--arch/x86/um/sysrq_32.c (renamed from arch/um/sys-x86/sysrq_32.c)0
-rw-r--r--arch/x86/um/sysrq_64.c (renamed from arch/um/sys-x86/sysrq_64.c)0
-rw-r--r--arch/x86/um/tls_32.c (renamed from arch/um/sys-x86/tls_32.c)0
-rw-r--r--arch/x86/um/tls_64.c (renamed from arch/um/sys-x86/tls_64.c)0
-rw-r--r--arch/x86/um/user-offsets.c (renamed from arch/um/sys-x86/user-offsets.c)0
-rw-r--r--arch/x86/um/vdso/Makefile (renamed from arch/um/sys-x86/vdso/Makefile)0
-rw-r--r--arch/x86/um/vdso/checkundef.sh (renamed from arch/um/sys-x86/vdso/checkundef.sh)0
-rw-r--r--arch/x86/um/vdso/um_vdso.c (renamed from arch/um/sys-x86/vdso/um_vdso.c)0
-rw-r--r--arch/x86/um/vdso/vdso-layout.lds.S (renamed from arch/um/sys-x86/vdso/vdso-layout.lds.S)0
-rw-r--r--arch/x86/um/vdso/vdso-note.S (renamed from arch/um/sys-x86/vdso/vdso-note.S)0
-rw-r--r--arch/x86/um/vdso/vdso.S (renamed from arch/um/sys-x86/vdso/vdso.S)2
-rw-r--r--arch/x86/um/vdso/vdso.lds.S (renamed from arch/um/sys-x86/vdso/vdso.lds.S)0
-rw-r--r--arch/x86/um/vdso/vma.c (renamed from arch/um/sys-x86/vdso/vma.c)0
93 files changed, 24 insertions, 25 deletions
diff --git a/arch/um/Makefile b/arch/um/Makefile
index 7492ee5837c4..7730af6ec13f 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -30,13 +30,17 @@ ifeq ($(SUBARCH),x86_64)
HEADER_ARCH := x86
endif
+HOST_DIR := arch/$(HEADER_ARCH)
+
include $(srctree)/$(ARCH_DIR)/Makefile-skas
-include $(srctree)/$(ARCH_DIR)/Makefile-$(HEADER_ARCH)
+include $(srctree)/$(HOST_DIR)/Makefile.um
+
+core-y += $(HOST_DIR)/um/
SHARED_HEADERS := $(ARCH_DIR)/include/shared
ARCH_INCLUDE := -I$(srctree)/$(SHARED_HEADERS)
-ARCH_INCLUDE += -I$(srctree)/$(ARCH_DIR)/sys-$(HEADER_ARCH)/shared
-KBUILD_CPPFLAGS += -I$(srctree)/$(ARCH_DIR)/sys-$(HEADER_ARCH)
+ARCH_INCLUDE += -I$(srctree)/$(HOST_DIR)/um/shared
+KBUILD_CPPFLAGS += -I$(srctree)/$(HOST_DIR)/um
# -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.
@@ -60,7 +64,7 @@ USER_CFLAGS = $(patsubst $(KERNEL_DEFINES),,$(patsubst -D__KERNEL__,,\
#This will adjust *FLAGS accordingly to the platform.
include $(srctree)/$(ARCH_DIR)/Makefile-os-$(OS)
-KBUILD_CPPFLAGS += -I$(srctree)/arch/$(HEADER_ARCH)/include
+KBUILD_CPPFLAGS += -I$(srctree)/$(HOST_DIR)/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
@@ -90,7 +94,7 @@ define archhelp
echo ' find in the kernel root.'
endef
-KBUILD_KCONFIG := arch/um/Kconfig.$(HEADER_ARCH)
+KBUILD_KCONFIG := $(HOST_DIR)/um/Kconfig
archprepare: include/generated/user_constants.h
@@ -131,8 +135,8 @@ archclean:
# Generated files
-$(ARCH_DIR)/sys-$(HEADER_ARCH)/user-offsets.s: FORCE
- $(Q)$(MAKE) $(build)=$(ARCH_DIR)/sys-$(HEADER_ARCH) $@
+$(HOST_DIR)/um/user-offsets.s: FORCE
+ $(Q)$(MAKE) $(build)=$(HOST_DIR)/um $@
define filechk_gen-asm-offsets
(set -e; \
@@ -147,7 +151,7 @@ define filechk_gen-asm-offsets
echo ""; )
endef
-include/generated/user_constants.h: $(ARCH_DIR)/sys-$(HEADER_ARCH)/user-offsets.s
+include/generated/user_constants.h: $(HOST_DIR)/um/user-offsets.s
$(call filechk,gen-asm-offsets)
-export SUBARCH USER_CFLAGS CFLAGS_NO_HARDENING OS HEADER_ARCH DEV_NULL_PATH
+export SUBARCH USER_CFLAGS CFLAGS_NO_HARDENING OS DEV_NULL_PATH
diff --git a/arch/um/os-Linux/Makefile b/arch/um/os-Linux/Makefile
index 7879e76e998f..015d00057663 100644
--- a/arch/um/os-Linux/Makefile
+++ b/arch/um/os-Linux/Makefile
@@ -5,7 +5,7 @@
obj-y = aio.o execvp.o file.o helper.o irq.o main.o mem.o process.o \
registers.o sigio.o signal.o start_up.o time.o tty.o \
- umid.o tls.o user_syms.o util.o drivers/ sys-$(HEADER_ARCH)/ skas/
+ umid.o tls.o user_syms.o util.o drivers/ skas/
obj-$(CONFIG_ARCH_REUSE_HOST_VSYSCALL_AREA) += elf_aux.o
diff --git a/arch/um/scripts/Makefile.rules b/arch/um/scripts/Makefile.rules
index 3a7efb017a73..2eb2843b0634 100644
--- a/arch/um/scripts/Makefile.rules
+++ b/arch/um/scripts/Makefile.rules
@@ -25,8 +25,3 @@ $(UNPROFILE_OBJS) : CHECKFLAGS := -D__linux__ -Dlinux -D__STDC__ \
define unprofile
$(patsubst -pg,,$(patsubst -fprofile-arcs -ftest-coverage,,$(1)))
endef
-
-ifdef subarch-obj-y
-obj-y += subarch.o
-subarch-y = $(addprefix ../../$(HEADER_ARCH)/,$(subarch-obj-y))
-endif
diff --git a/arch/um/Makefile-x86 b/arch/x86/Makefile.um
index 68fbd1b7c9f2..36ddec6a41c9 100644
--- a/arch/um/Makefile-x86
+++ b/arch/x86/Makefile.um
@@ -1,4 +1,4 @@
-core-y += arch/um/sys-x86/ arch/x86/crypto/
+core-y += arch/x86/crypto/
ifeq ($(CONFIG_X86_32),y)
START := 0x8048000
diff --git a/arch/um/Kconfig.x86 b/arch/x86/um/Kconfig
index 21bebe63df66..21bebe63df66 100644
--- a/arch/um/Kconfig.x86
+++ b/arch/x86/um/Kconfig
diff --git a/arch/um/sys-x86/Makefile b/arch/x86/um/Makefile
index 81ab3484a430..df419896693f 100644
--- a/arch/um/sys-x86/Makefile
+++ b/arch/x86/um/Makefile
@@ -11,28 +11,28 @@ endif
obj-y = bug.o bugs_$(BITS).o delay_$(BITS).o fault.o ksyms.o ldt.o \
ptrace_$(BITS).o ptrace_user.o setjmp_$(BITS).o signal_$(BITS).o \
stub_$(BITS).o stub_segv.o syscalls_$(BITS).o \
- sys_call_table_$(BITS).o sysrq_$(BITS).o tls_$(BITS).o mem_$(BITS).o
+ sys_call_table_$(BITS).o sysrq_$(BITS).o tls_$(BITS).o \
+ mem_$(BITS).o subarch.o os-$(OS)/
ifeq ($(CONFIG_X86_32),y)
obj-y += checksum_32.o
obj-$(CONFIG_BINFMT_ELF) += elfcore.o
-subarch-obj-y = lib/string_32.o lib/atomic64_32.o lib/atomic64_cx8_32.o
-subarch-obj-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += lib/rwsem.o
-subarch-obj-$(CONFIG_HIGHMEM) += mm/highmem_32.o
-subarch-obj-$(CONFIG_MODULES) += kernel/module.o
+subarch-y = ../lib/string_32.o ../lib/atomic64_32.o ../lib/atomic64_cx8_32.o
+subarch-$(CONFIG_RWSEM_XCHGADD_ALGORITHM) += ../lib/rwsem.o
+subarch-$(CONFIG_HIGHMEM) += ../mm/highmem_32.o
else
obj-y += vdso/
-subarch-obj-y = lib/csum-partial_64.o lib/memcpy_64.o lib/thunk_64.o \
- lib/rwsem.o
+subarch-y = ../lib/csum-partial_64.o ../lib/memcpy_64.o ../lib/thunk_64.o \
+ ../lib/rwsem.o
endif
-subarch-obj-$(CONFIG_MODULES) += kernel/module.o
+subarch-$(CONFIG_MODULES) += ../kernel/module.o
USER_OBJS := bugs_$(BITS).o ptrace_user.o fault.o
diff --git a/arch/um/sys-x86/asm/arch_hweight.h b/arch/x86/um/asm/arch_hweight.h
index c656cf443f4a..c656cf443f4a 100644
--- a/arch/um/sys-x86/asm/arch_hweight.h
+++ b/arch/x86/um/asm/arch_hweight.h
diff --git a/arch/um/sys-x86/asm/archparam.h b/arch/x86/um/asm/archparam.h
index c17cf68dda0f..c17cf68dda0f 100644
--- a/arch/um/sys-x86/asm/archparam.h
+++ b/arch/x86/um/asm/archparam.h
diff --git a/arch/um/sys-x86/asm/checksum.h b/arch/x86/um/asm/checksum.h
index b6efe2381b5d..b6efe2381b5d 100644
--- a/arch/um/sys-x86/asm/checksum.h
+++ b/arch/x86/um/asm/checksum.h
diff --git a/arch/um/sys-x86/asm/checksum_32.h b/arch/x86/um/asm/checksum_32.h
index caab74252e27..caab74252e27 100644
--- a/arch/um/sys-x86/asm/checksum_32.h
+++ b/arch/x86/um/asm/checksum_32.h
diff --git a/arch/um/sys-x86/asm/checksum_64.h b/arch/x86/um/asm/checksum_64.h
index a5be9031ea85..a5be9031ea85 100644
--- a/arch/um/sys-x86/asm/checksum_64.h
+++ b/arch/x86/um/asm/checksum_64.h
diff --git a/arch/um/sys-x86/asm/elf.h b/arch/x86/um/asm/elf.h
index f3b0633b69a1..f3b0633b69a1 100644
--- a/arch/um/sys-x86/asm/elf.h
+++ b/arch/x86/um/asm/elf.h
diff --git a/arch/um/sys-x86/asm/module.h b/arch/x86/um/asm/module.h
index 61af80e932eb..61af80e932eb 100644
--- a/arch/um/sys-x86/asm/module.h
+++ b/arch/x86/um/asm/module.h
diff --git a/arch/um/sys-x86/asm/processor.h b/arch/x86/um/asm/processor.h
index d3ac1cecf0f4..d3ac1cecf0f4 100644
--- a/arch/um/sys-x86/asm/processor.h
+++ b/arch/x86/um/asm/processor.h
diff --git a/arch/um/sys-x86/asm/processor_32.h b/arch/x86/um/asm/processor_32.h
index ae0d189aafcf..ae0d189aafcf 100644
--- a/arch/um/sys-x86/asm/processor_32.h
+++ b/arch/x86/um/asm/processor_32.h
diff --git a/arch/um/sys-x86/asm/processor_64.h b/arch/x86/um/asm/processor_64.h
index 6db812b24f48..6db812b24f48 100644
--- a/arch/um/sys-x86/asm/processor_64.h
+++ b/arch/x86/um/asm/processor_64.h
diff --git a/arch/um/sys-x86/asm/ptrace.h b/arch/x86/um/asm/ptrace.h
index c8aca8c501b0..c8aca8c501b0 100644
--- a/arch/um/sys-x86/asm/ptrace.h
+++ b/arch/x86/um/asm/ptrace.h
diff --git a/arch/um/sys-x86/asm/ptrace_32.h b/arch/x86/um/asm/ptrace_32.h
index 5d2a59112537..5d2a59112537 100644
--- a/arch/um/sys-x86/asm/ptrace_32.h
+++ b/arch/x86/um/asm/ptrace_32.h
diff --git a/arch/um/sys-x86/asm/ptrace_64.h b/arch/x86/um/asm/ptrace_64.h
index 83d8c473b905..83d8c473b905 100644
--- a/arch/um/sys-x86/asm/ptrace_64.h
+++ b/arch/x86/um/asm/ptrace_64.h
diff --git a/arch/um/sys-x86/asm/system.h b/arch/x86/um/asm/system.h
index a89113bc74f2..a89113bc74f2 100644
--- a/arch/um/sys-x86/asm/system.h
+++ b/arch/x86/um/asm/system.h
diff --git a/arch/um/sys-x86/asm/vm-flags.h b/arch/x86/um/asm/vm-flags.h
index 7c297e9e2413..7c297e9e2413 100644
--- a/arch/um/sys-x86/asm/vm-flags.h
+++ b/arch/x86/um/asm/vm-flags.h
diff --git a/arch/um/sys-x86/bug.c b/arch/x86/um/bug.c
index e8034e363d83..e8034e363d83 100644
--- a/arch/um/sys-x86/bug.c
+++ b/arch/x86/um/bug.c
diff --git a/arch/um/sys-x86/bugs_32.c b/arch/x86/um/bugs_32.c
index 7058e1fa903b..7058e1fa903b 100644
--- a/arch/um/sys-x86/bugs_32.c
+++ b/arch/x86/um/bugs_32.c
diff --git a/arch/um/sys-x86/bugs_64.c b/arch/x86/um/bugs_64.c
index 44e02ba2a265..44e02ba2a265 100644
--- a/arch/um/sys-x86/bugs_64.c
+++ b/arch/x86/um/bugs_64.c
diff --git a/arch/um/sys-x86/checksum_32.S b/arch/x86/um/checksum_32.S
index f058d2f82e18..f058d2f82e18 100644
--- a/arch/um/sys-x86/checksum_32.S
+++ b/arch/x86/um/checksum_32.S
diff --git a/arch/um/sys-x86/delay_32.c b/arch/x86/um/delay_32.c
index f3fe1a688f7e..f3fe1a688f7e 100644
--- a/arch/um/sys-x86/delay_32.c
+++ b/arch/x86/um/delay_32.c
diff --git a/arch/um/sys-x86/delay_64.c b/arch/x86/um/delay_64.c
index f3fe1a688f7e..f3fe1a688f7e 100644
--- a/arch/um/sys-x86/delay_64.c
+++ b/arch/x86/um/delay_64.c
diff --git a/arch/um/sys-x86/elfcore.c b/arch/x86/um/elfcore.c
index 6bb49b687c97..6bb49b687c97 100644
--- a/arch/um/sys-x86/elfcore.c
+++ b/arch/x86/um/elfcore.c
diff --git a/arch/um/sys-x86/fault.c b/arch/x86/um/fault.c
index d670f68532f4..d670f68532f4 100644
--- a/arch/um/sys-x86/fault.c
+++ b/arch/x86/um/fault.c
diff --git a/arch/um/sys-x86/ksyms.c b/arch/x86/um/ksyms.c
index 2e8f43ec6214..2e8f43ec6214 100644
--- a/arch/um/sys-x86/ksyms.c
+++ b/arch/x86/um/ksyms.c
diff --git a/arch/um/sys-x86/ldt.c b/arch/x86/um/ldt.c
index 3f2bf208d884..3f2bf208d884 100644
--- a/arch/um/sys-x86/ldt.c
+++ b/arch/x86/um/ldt.c
diff --git a/arch/um/sys-x86/mem_32.c b/arch/x86/um/mem_32.c
index 639900a6fde9..639900a6fde9 100644
--- a/arch/um/sys-x86/mem_32.c
+++ b/arch/x86/um/mem_32.c
diff --git a/arch/um/sys-x86/mem_64.c b/arch/x86/um/mem_64.c
index 546518727a73..546518727a73 100644
--- a/arch/um/sys-x86/mem_64.c
+++ b/arch/x86/um/mem_64.c
diff --git a/arch/um/os-Linux/sys-x86/Makefile b/arch/x86/um/os-Linux/Makefile
index 253bfb8cb702..253bfb8cb702 100644
--- a/arch/um/os-Linux/sys-x86/Makefile
+++ b/arch/x86/um/os-Linux/Makefile
diff --git a/arch/um/os-Linux/sys-x86/mcontext.c b/arch/x86/um/os-Linux/mcontext.c
index 1d33d72c6284..1d33d72c6284 100644
--- a/arch/um/os-Linux/sys-x86/mcontext.c
+++ b/arch/x86/um/os-Linux/mcontext.c
diff --git a/arch/um/os-Linux/sys-x86/prctl.c b/arch/x86/um/os-Linux/prctl.c
index 9d34eddb517f..9d34eddb517f 100644
--- a/arch/um/os-Linux/sys-x86/prctl.c
+++ b/arch/x86/um/os-Linux/prctl.c
diff --git a/arch/um/os-Linux/sys-x86/registers.c b/arch/x86/um/os-Linux/registers.c
index 3a9b6247bbbc..3a9b6247bbbc 100644
--- a/arch/um/os-Linux/sys-x86/registers.c
+++ b/arch/x86/um/os-Linux/registers.c
diff --git a/arch/um/os-Linux/sys-x86/task_size.c b/arch/x86/um/os-Linux/task_size.c
index efb16c5c9bcf..efb16c5c9bcf 100644
--- a/arch/um/os-Linux/sys-x86/task_size.c
+++ b/arch/x86/um/os-Linux/task_size.c
diff --git a/arch/um/os-Linux/sys-x86/tls.c b/arch/x86/um/os-Linux/tls.c
index 281e83ecce3d..281e83ecce3d 100644
--- a/arch/um/os-Linux/sys-x86/tls.c
+++ b/arch/x86/um/os-Linux/tls.c
diff --git a/arch/um/sys-x86/ptrace_32.c b/arch/x86/um/ptrace_32.c
index a174fde2531c..a174fde2531c 100644
--- a/arch/um/sys-x86/ptrace_32.c
+++ b/arch/x86/um/ptrace_32.c
diff --git a/arch/um/sys-x86/ptrace_64.c b/arch/x86/um/ptrace_64.c
index 44e68e0c0d10..44e68e0c0d10 100644
--- a/arch/um/sys-x86/ptrace_64.c
+++ b/arch/x86/um/ptrace_64.c
diff --git a/arch/um/sys-x86/ptrace_user.c b/arch/x86/um/ptrace_user.c
index 3960ca1dd35a..3960ca1dd35a 100644
--- a/arch/um/sys-x86/ptrace_user.c
+++ b/arch/x86/um/ptrace_user.c
diff --git a/arch/um/sys-x86/setjmp_32.S b/arch/x86/um/setjmp_32.S
index b766792c9933..b766792c9933 100644
--- a/arch/um/sys-x86/setjmp_32.S
+++ b/arch/x86/um/setjmp_32.S
diff --git a/arch/um/sys-x86/setjmp_64.S b/arch/x86/um/setjmp_64.S
index 45f547b4043e..45f547b4043e 100644
--- a/arch/um/sys-x86/setjmp_64.S
+++ b/arch/x86/um/setjmp_64.S
diff --git a/arch/um/sys-x86/shared/sysdep/archsetjmp.h b/arch/x86/um/shared/sysdep/archsetjmp.h
index ff7766d28226..ff7766d28226 100644
--- a/arch/um/sys-x86/shared/sysdep/archsetjmp.h
+++ b/arch/x86/um/shared/sysdep/archsetjmp.h
diff --git a/arch/um/sys-x86/shared/sysdep/archsetjmp_32.h b/arch/x86/um/shared/sysdep/archsetjmp_32.h
index 0f312085ce1d..0f312085ce1d 100644
--- a/arch/um/sys-x86/shared/sysdep/archsetjmp_32.h
+++ b/arch/x86/um/shared/sysdep/archsetjmp_32.h
diff --git a/arch/um/sys-x86/shared/sysdep/archsetjmp_64.h b/arch/x86/um/shared/sysdep/archsetjmp_64.h
index 2af8f12ca161..2af8f12ca161 100644
--- a/arch/um/sys-x86/shared/sysdep/archsetjmp_64.h
+++ b/arch/x86/um/shared/sysdep/archsetjmp_64.h
diff --git a/arch/um/sys-x86/shared/sysdep/faultinfo.h b/arch/x86/um/shared/sysdep/faultinfo.h
index 862ecb1c7781..862ecb1c7781 100644
--- a/arch/um/sys-x86/shared/sysdep/faultinfo.h
+++ b/arch/x86/um/shared/sysdep/faultinfo.h
diff --git a/arch/um/sys-x86/shared/sysdep/faultinfo_32.h b/arch/x86/um/shared/sysdep/faultinfo_32.h
index a26086b8a800..a26086b8a800 100644
--- a/arch/um/sys-x86/shared/sysdep/faultinfo_32.h
+++ b/arch/x86/um/shared/sysdep/faultinfo_32.h
diff --git a/arch/um/sys-x86/shared/sysdep/faultinfo_64.h b/arch/x86/um/shared/sysdep/faultinfo_64.h
index f811cbe15d62..f811cbe15d62 100644
--- a/arch/um/sys-x86/shared/sysdep/faultinfo_64.h
+++ b/arch/x86/um/shared/sysdep/faultinfo_64.h
diff --git a/arch/um/sys-x86/shared/sysdep/host_ldt.h b/arch/x86/um/shared/sysdep/host_ldt.h
index 94518b3e0da5..94518b3e0da5 100644
--- a/arch/um/sys-x86/shared/sysdep/host_ldt.h
+++ b/arch/x86/um/shared/sysdep/host_ldt.h
diff --git a/arch/um/sys-x86/shared/sysdep/host_ldt_32.h b/arch/x86/um/shared/sysdep/host_ldt_32.h
index 0953cc4df652..0953cc4df652 100644
--- a/arch/um/sys-x86/shared/sysdep/host_ldt_32.h
+++ b/arch/x86/um/shared/sysdep/host_ldt_32.h
diff --git a/arch/um/sys-x86/shared/sysdep/host_ldt_64.h b/arch/x86/um/shared/sysdep/host_ldt_64.h
index e8b1be1e154f..e8b1be1e154f 100644
--- a/arch/um/sys-x86/shared/sysdep/host_ldt_64.h
+++ b/arch/x86/um/shared/sysdep/host_ldt_64.h
diff --git a/arch/um/sys-x86/shared/sysdep/kernel-offsets.h b/arch/x86/um/shared/sysdep/kernel-offsets.h
index 5868526b5eef..5868526b5eef 100644
--- a/arch/um/sys-x86/shared/sysdep/kernel-offsets.h
+++ b/arch/x86/um/shared/sysdep/kernel-offsets.h
diff --git a/arch/um/sys-x86/shared/sysdep/mcontext.h b/arch/x86/um/shared/sysdep/mcontext.h
index b724c54da316..b724c54da316 100644
--- a/arch/um/sys-x86/shared/sysdep/mcontext.h
+++ b/arch/x86/um/shared/sysdep/mcontext.h
diff --git a/arch/um/sys-x86/shared/sysdep/ptrace.h b/arch/x86/um/shared/sysdep/ptrace.h
index 711b1621747f..711b1621747f 100644
--- a/arch/um/sys-x86/shared/sysdep/ptrace.h
+++ b/arch/x86/um/shared/sysdep/ptrace.h
diff --git a/arch/um/sys-x86/shared/sysdep/ptrace_32.h b/arch/x86/um/shared/sysdep/ptrace_32.h
index ce77fa1e2a15..ce77fa1e2a15 100644
--- a/arch/um/sys-x86/shared/sysdep/ptrace_32.h
+++ b/arch/x86/um/shared/sysdep/ptrace_32.h
diff --git a/arch/um/sys-x86/shared/sysdep/ptrace_64.h b/arch/x86/um/shared/sysdep/ptrace_64.h
index 866fe7e47369..866fe7e47369 100644
--- a/arch/um/sys-x86/shared/sysdep/ptrace_64.h
+++ b/arch/x86/um/shared/sysdep/ptrace_64.h
diff --git a/arch/um/sys-x86/shared/sysdep/ptrace_user.h b/arch/x86/um/shared/sysdep/ptrace_user.h
index a92f883264ed..a92f883264ed 100644
--- a/arch/um/sys-x86/shared/sysdep/ptrace_user.h
+++ b/arch/x86/um/shared/sysdep/ptrace_user.h
diff --git a/arch/um/sys-x86/shared/sysdep/ptrace_user_32.h b/arch/x86/um/shared/sysdep/ptrace_user_32.h
index 9d88a79a138b..9d88a79a138b 100644
--- a/arch/um/sys-x86/shared/sysdep/ptrace_user_32.h
+++ b/arch/x86/um/shared/sysdep/ptrace_user_32.h
diff --git a/arch/um/sys-x86/shared/sysdep/ptrace_user_64.h b/arch/x86/um/shared/sysdep/ptrace_user_64.h
index 2f1b6e33d590..2f1b6e33d590 100644
--- a/arch/um/sys-x86/shared/sysdep/ptrace_user_64.h
+++ b/arch/x86/um/shared/sysdep/ptrace_user_64.h
diff --git a/arch/um/sys-x86/shared/sysdep/skas_ptrace.h b/arch/x86/um/shared/sysdep/skas_ptrace.h
index 453febe98993..453febe98993 100644
--- a/arch/um/sys-x86/shared/sysdep/skas_ptrace.h
+++ b/arch/x86/um/shared/sysdep/skas_ptrace.h
diff --git a/arch/um/sys-x86/shared/sysdep/stub.h b/arch/x86/um/shared/sysdep/stub.h
index bd161e300102..bd161e300102 100644
--- a/arch/um/sys-x86/shared/sysdep/stub.h
+++ b/arch/x86/um/shared/sysdep/stub.h
diff --git a/arch/um/sys-x86/shared/sysdep/stub_32.h b/arch/x86/um/shared/sysdep/stub_32.h
index 51fd256c75f0..51fd256c75f0 100644
--- a/arch/um/sys-x86/shared/sysdep/stub_32.h
+++ b/arch/x86/um/shared/sysdep/stub_32.h
diff --git a/arch/um/sys-x86/shared/sysdep/stub_64.h b/arch/x86/um/shared/sysdep/stub_64.h
index 994df93c5ed3..994df93c5ed3 100644
--- a/arch/um/sys-x86/shared/sysdep/stub_64.h
+++ b/arch/x86/um/shared/sysdep/stub_64.h
diff --git a/arch/um/sys-x86/shared/sysdep/syscalls.h b/arch/x86/um/shared/sysdep/syscalls.h
index bd9a89b67e41..bd9a89b67e41 100644
--- a/arch/um/sys-x86/shared/sysdep/syscalls.h
+++ b/arch/x86/um/shared/sysdep/syscalls.h
diff --git a/arch/um/sys-x86/shared/sysdep/syscalls_32.h b/arch/x86/um/shared/sysdep/syscalls_32.h
index 05cb796aecb5..05cb796aecb5 100644
--- a/arch/um/sys-x86/shared/sysdep/syscalls_32.h
+++ b/arch/x86/um/shared/sysdep/syscalls_32.h
diff --git a/arch/um/sys-x86/shared/sysdep/syscalls_64.h b/arch/x86/um/shared/sysdep/syscalls_64.h
index 8a7d5e1da98e..8a7d5e1da98e 100644
--- a/arch/um/sys-x86/shared/sysdep/syscalls_64.h
+++ b/arch/x86/um/shared/sysdep/syscalls_64.h
diff --git a/arch/um/sys-x86/shared/sysdep/tls.h b/arch/x86/um/shared/sysdep/tls.h
index 4d8f75262370..4d8f75262370 100644
--- a/arch/um/sys-x86/shared/sysdep/tls.h
+++ b/arch/x86/um/shared/sysdep/tls.h
diff --git a/arch/um/sys-x86/shared/sysdep/tls_32.h b/arch/x86/um/shared/sysdep/tls_32.h
index 34550755b2a1..34550755b2a1 100644
--- a/arch/um/sys-x86/shared/sysdep/tls_32.h
+++ b/arch/x86/um/shared/sysdep/tls_32.h
diff --git a/arch/um/sys-x86/shared/sysdep/tls_64.h b/arch/x86/um/shared/sysdep/tls_64.h
index 18c000d0357a..18c000d0357a 100644
--- a/arch/um/sys-x86/shared/sysdep/tls_64.h
+++ b/arch/x86/um/shared/sysdep/tls_64.h
diff --git a/arch/um/sys-x86/signal_32.c b/arch/x86/um/signal_32.c
index bcbfb0d64813..bcbfb0d64813 100644
--- a/arch/um/sys-x86/signal_32.c
+++ b/arch/x86/um/signal_32.c
diff --git a/arch/um/sys-x86/signal_64.c b/arch/x86/um/signal_64.c
index 255b2ca0ce67..255b2ca0ce67 100644
--- a/arch/um/sys-x86/signal_64.c
+++ b/arch/x86/um/signal_64.c
diff --git a/arch/um/sys-x86/stub_32.S b/arch/x86/um/stub_32.S
index 54a36ec20cb7..54a36ec20cb7 100644
--- a/arch/um/sys-x86/stub_32.S
+++ b/arch/x86/um/stub_32.S
diff --git a/arch/um/sys-x86/stub_64.S b/arch/x86/um/stub_64.S
index 20e4a96a6dcb..20e4a96a6dcb 100644
--- a/arch/um/sys-x86/stub_64.S
+++ b/arch/x86/um/stub_64.S
diff --git a/arch/um/sys-x86/stub_segv.c b/arch/x86/um/stub_segv.c
index b7450bd22e7d..b7450bd22e7d 100644
--- a/arch/um/sys-x86/stub_segv.c
+++ b/arch/x86/um/stub_segv.c
diff --git a/arch/um/sys-x86/sys_call_table_32.S b/arch/x86/um/sys_call_table_32.S
index de274071455d..de274071455d 100644
--- a/arch/um/sys-x86/sys_call_table_32.S
+++ b/arch/x86/um/sys_call_table_32.S
diff --git a/arch/um/sys-x86/sys_call_table_64.c b/arch/x86/um/sys_call_table_64.c
index f46de82d675c..f46de82d675c 100644
--- a/arch/um/sys-x86/sys_call_table_64.c
+++ b/arch/x86/um/sys_call_table_64.c
diff --git a/arch/um/sys-x86/syscalls_32.c b/arch/x86/um/syscalls_32.c
index 70ca357393b8..70ca357393b8 100644
--- a/arch/um/sys-x86/syscalls_32.c
+++ b/arch/x86/um/syscalls_32.c
diff --git a/arch/um/sys-x86/syscalls_64.c b/arch/x86/um/syscalls_64.c
index f3d82bb6e15a..f3d82bb6e15a 100644
--- a/arch/um/sys-x86/syscalls_64.c
+++ b/arch/x86/um/syscalls_64.c
diff --git a/arch/um/sys-x86/sysrq_32.c b/arch/x86/um/sysrq_32.c
index 171b3e9dc867..171b3e9dc867 100644
--- a/arch/um/sys-x86/sysrq_32.c
+++ b/arch/x86/um/sysrq_32.c
diff --git a/arch/um/sys-x86/sysrq_64.c b/arch/x86/um/sysrq_64.c
index f4f82beb3508..f4f82beb3508 100644
--- a/arch/um/sys-x86/sysrq_64.c
+++ b/arch/x86/um/sysrq_64.c
diff --git a/arch/um/sys-x86/tls_32.c b/arch/x86/um/tls_32.c
index c6c7131e563b..c6c7131e563b 100644
--- a/arch/um/sys-x86/tls_32.c
+++ b/arch/x86/um/tls_32.c
diff --git a/arch/um/sys-x86/tls_64.c b/arch/x86/um/tls_64.c
index f7ba46200ecd..f7ba46200ecd 100644
--- a/arch/um/sys-x86/tls_64.c
+++ b/arch/x86/um/tls_64.c
diff --git a/arch/um/sys-x86/user-offsets.c b/arch/x86/um/user-offsets.c
index 3c19c48a1d48..3c19c48a1d48 100644
--- a/arch/um/sys-x86/user-offsets.c
+++ b/arch/x86/um/user-offsets.c
diff --git a/arch/um/sys-x86/vdso/Makefile b/arch/x86/um/vdso/Makefile
index 5dffe6d46686..5dffe6d46686 100644
--- a/arch/um/sys-x86/vdso/Makefile
+++ b/arch/x86/um/vdso/Makefile
diff --git a/arch/um/sys-x86/vdso/checkundef.sh b/arch/x86/um/vdso/checkundef.sh
index 7ee90a9b549d..7ee90a9b549d 100644
--- a/arch/um/sys-x86/vdso/checkundef.sh
+++ b/arch/x86/um/vdso/checkundef.sh
diff --git a/arch/um/sys-x86/vdso/um_vdso.c b/arch/x86/um/vdso/um_vdso.c
index 7c441b59d375..7c441b59d375 100644
--- a/arch/um/sys-x86/vdso/um_vdso.c
+++ b/arch/x86/um/vdso/um_vdso.c
diff --git a/arch/um/sys-x86/vdso/vdso-layout.lds.S b/arch/x86/um/vdso/vdso-layout.lds.S
index 634a2cf62046..634a2cf62046 100644
--- a/arch/um/sys-x86/vdso/vdso-layout.lds.S
+++ b/arch/x86/um/vdso/vdso-layout.lds.S
diff --git a/arch/um/sys-x86/vdso/vdso-note.S b/arch/x86/um/vdso/vdso-note.S
index 79a071e4357e..79a071e4357e 100644
--- a/arch/um/sys-x86/vdso/vdso-note.S
+++ b/arch/x86/um/vdso/vdso-note.S
diff --git a/arch/um/sys-x86/vdso/vdso.S b/arch/x86/um/vdso/vdso.S
index 03b053283f86..1cb468adacbb 100644
--- a/arch/um/sys-x86/vdso/vdso.S
+++ b/arch/x86/um/vdso/vdso.S
@@ -4,7 +4,7 @@ __INITDATA
.globl vdso_start, vdso_end
vdso_start:
- .incbin "arch/um/sys-x86/vdso/vdso.so"
+ .incbin "arch/x86/um/vdso/vdso.so"
vdso_end:
__FINIT
diff --git a/arch/um/sys-x86/vdso/vdso.lds.S b/arch/x86/um/vdso/vdso.lds.S
index b96b2677cad8..b96b2677cad8 100644
--- a/arch/um/sys-x86/vdso/vdso.lds.S
+++ b/arch/x86/um/vdso/vdso.lds.S
diff --git a/arch/um/sys-x86/vdso/vma.c b/arch/x86/um/vdso/vma.c
index 9495c8d0ce37..9495c8d0ce37 100644
--- a/arch/um/sys-x86/vdso/vma.c
+++ b/arch/x86/um/vdso/vma.c