diff options
author | Al Viro <viro@ftp.linux.org.uk> | 2011-08-18 20:06:39 +0100 |
---|---|---|
committer | Richard Weinberger <richard@nod.at> | 2011-11-02 14:15:05 +0100 |
commit | 5c48b108ecbf6505d929e64d50dace13ac2bdf34 (patch) | |
tree | 016904f84fbe05aa301c5cdfe712d90f6bb828fe | |
parent | 7bbe7204e93734fe79d8aac3e08a7cb4624b5004 (diff) | |
download | xhci-5c48b108ecbf6505d929e64d50dace13ac2bdf34.tar.gz |
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>
-rw-r--r-- | arch/um/Makefile | 22 | ||||
-rw-r--r-- | arch/um/os-Linux/Makefile | 2 | ||||
-rw-r--r-- | arch/um/scripts/Makefile.rules | 5 | ||||
-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 7492ee5837c48b..7730af6ec13feb 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 7879e76e998f6a..015d000576632d 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 3a7efb017a7398..2eb2843b06343c 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 68fbd1b7c9f2b7..36ddec6a41c9fd 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 21bebe63df6660..21bebe63df6660 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 81ab3484a430a7..df419896693f24 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 c656cf443f4a2b..c656cf443f4a2b 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 c17cf68dda0f19..c17cf68dda0f19 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 b6efe2381b5dc1..b6efe2381b5dc1 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 caab74252e27d6..caab74252e27d6 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 a5be9031ea851f..a5be9031ea851f 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 f3b0633b69a110..f3b0633b69a110 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 61af80e932ebfb..61af80e932ebfb 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 d3ac1cecf0f4f8..d3ac1cecf0f4f8 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 ae0d189aafcf30..ae0d189aafcf30 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 6db812b24f48a5..6db812b24f48a5 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 c8aca8c501b0e4..c8aca8c501b0e4 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 5d2a59112537b1..5d2a59112537b1 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 83d8c473b90588..83d8c473b90588 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 a89113bc74f2e3..a89113bc74f2e3 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 7c297e9e241387..7c297e9e241387 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 e8034e363d83f9..e8034e363d83f9 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 7058e1fa903b43..7058e1fa903b43 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 44e02ba2a2656c..44e02ba2a2656c 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 f058d2f82e189b..f058d2f82e189b 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 f3fe1a688f7ecb..f3fe1a688f7ecb 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 f3fe1a688f7ecb..f3fe1a688f7ecb 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 6bb49b687c9791..6bb49b687c9791 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 d670f68532f4d1..d670f68532f4d1 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 2e8f43ec621471..2e8f43ec621471 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 3f2bf208d884ec..3f2bf208d884ec 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 639900a6fde994..639900a6fde994 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 546518727a731b..546518727a731b 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 253bfb8cb702da..253bfb8cb702da 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 1d33d72c6284d7..1d33d72c6284d7 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 9d34eddb517fdc..9d34eddb517fdc 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 3a9b6247bbbc5a..3a9b6247bbbc5a 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 efb16c5c9bcf1b..efb16c5c9bcf1b 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 281e83ecce3d7c..281e83ecce3d7c 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 a174fde2531c1b..a174fde2531c1b 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 44e68e0c0d10bf..44e68e0c0d10bf 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 3960ca1dd35a3b..3960ca1dd35a3b 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 b766792c99335a..b766792c99335a 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 45f547b4043eed..45f547b4043eed 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 ff7766d282263b..ff7766d282263b 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 0f312085ce1d26..0f312085ce1d26 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 2af8f12ca16169..2af8f12ca16169 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 862ecb1c7781b2..862ecb1c7781b2 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 a26086b8a80022..a26086b8a80022 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 f811cbe15d623b..f811cbe15d623b 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 94518b3e0da544..94518b3e0da544 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 0953cc4df65284..0953cc4df65284 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 e8b1be1e154f44..e8b1be1e154f44 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 5868526b5eefa3..5868526b5eefa3 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 b724c54da31601..b724c54da31601 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 711b1621747f2e..711b1621747f2e 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 ce77fa1e2a1558..ce77fa1e2a1558 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 866fe7e4736975..866fe7e4736975 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 a92f883264ed39..a92f883264ed39 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 9d88a79a138b09..9d88a79a138b09 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 2f1b6e33d59074..2f1b6e33d59074 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 453febe9899392..453febe9899392 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 bd161e300102c7..bd161e300102c7 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 51fd256c75f00f..51fd256c75f00f 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 994df93c5ed34b..994df93c5ed34b 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 bd9a89b67e41f2..bd9a89b67e41f2 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 05cb796aecb55f..05cb796aecb55f 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 8a7d5e1da98e5a..8a7d5e1da98e5a 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 4d8f7526237037..4d8f7526237037 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 34550755b2a162..34550755b2a162 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 18c000d0357a3f..18c000d0357a3f 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 bcbfb0d6481308..bcbfb0d6481308 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 255b2ca0ce67c2..255b2ca0ce67c2 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 54a36ec20cb75c..54a36ec20cb75c 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 20e4a96a6dcbe0..20e4a96a6dcbe0 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 b7450bd22e7d1d..b7450bd22e7d1d 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 de274071455d00..de274071455d00 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 f46de82d675c16..f46de82d675c16 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 70ca357393b86f..70ca357393b86f 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 f3d82bb6e15a41..f3d82bb6e15a41 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 171b3e9dc86777..171b3e9dc86777 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 f4f82beb350889..f4f82beb350889 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 c6c7131e563bca..c6c7131e563bca 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 f7ba46200ecdd0..f7ba46200ecdd0 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 3c19c48a1d4869..3c19c48a1d4869 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 5dffe6d466865d..5dffe6d466865d 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 7ee90a9b549da3..7ee90a9b549da3 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 7c441b59d3752e..7c441b59d3752e 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 634a2cf620465e..634a2cf620465e 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 79a071e4357e4b..79a071e4357e4b 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 03b053283f8669..1cb468adacbbd5 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 b96b2677cad828..b96b2677cad828 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 9495c8d0ce37e9..9495c8d0ce37e9 100644 --- a/arch/um/sys-x86/vdso/vma.c +++ b/arch/x86/um/vdso/vma.c |