summaryrefslogtreecommitdiff
path: root/arch/um
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2008-08-23 17:28:20 -0400
committerH. Peter Anvin <hpa@zytor.com>2008-10-22 22:55:22 -0700
commitaa7bd942498512d6b77d1d0da846a8ecdd5d6186 (patch)
tree9a420b59a1e862ea47a4c5f89601ffbdf3366922 /arch/um
parent4198426af37e7122f2fda2538fa9dcaa19c5e397 (diff)
downloadlinux-3.10-aa7bd942498512d6b77d1d0da846a8ecdd5d6186.tar.gz
linux-3.10-aa7bd942498512d6b77d1d0da846a8ecdd5d6186.tar.bz2
linux-3.10-aa7bd942498512d6b77d1d0da846a8ecdd5d6186.zip
x86, um: get rid of header symlinks
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk> Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/um')
-rw-r--r--arch/um/Makefile24
-rw-r--r--arch/um/sys-i386/asm/archparam.h (renamed from arch/um/include/asm/archparam-i386.h)0
-rw-r--r--arch/um/sys-i386/asm/elf.h (renamed from arch/um/include/asm/elf-i386.h)0
-rw-r--r--arch/um/sys-i386/asm/module.h (renamed from arch/um/include/asm/module-i386.h)0
-rw-r--r--arch/um/sys-i386/asm/processor.h (renamed from arch/um/include/asm/processor-i386.h)0
-rw-r--r--arch/um/sys-i386/asm/ptrace.h (renamed from arch/um/include/asm/ptrace-i386.h)0
-rw-r--r--arch/um/sys-i386/shared/sysdep/archsetjmp.h (renamed from arch/um/sys-i386/sysdep/archsetjmp.h)0
-rw-r--r--arch/um/sys-i386/shared/sysdep/barrier.h (renamed from arch/um/sys-i386/sysdep/barrier.h)0
-rw-r--r--arch/um/sys-i386/shared/sysdep/checksum.h (renamed from arch/um/sys-i386/sysdep/checksum.h)0
-rw-r--r--arch/um/sys-i386/shared/sysdep/faultinfo.h (renamed from arch/um/sys-i386/sysdep/faultinfo.h)0
-rw-r--r--arch/um/sys-i386/shared/sysdep/host_ldt.h (renamed from arch/um/sys-i386/sysdep/host_ldt.h)0
-rw-r--r--arch/um/sys-i386/shared/sysdep/kernel-offsets.h (renamed from arch/um/sys-i386/sysdep/kernel-offsets.h)0
-rw-r--r--arch/um/sys-i386/shared/sysdep/ptrace.h (renamed from arch/um/sys-i386/sysdep/ptrace.h)0
-rw-r--r--arch/um/sys-i386/shared/sysdep/ptrace_user.h (renamed from arch/um/sys-i386/sysdep/ptrace_user.h)0
-rw-r--r--arch/um/sys-i386/shared/sysdep/sc.h (renamed from arch/um/sys-i386/sysdep/sc.h)0
-rw-r--r--arch/um/sys-i386/shared/sysdep/sigcontext.h (renamed from arch/um/sys-i386/sysdep/sigcontext.h)0
-rw-r--r--arch/um/sys-i386/shared/sysdep/skas_ptrace.h (renamed from arch/um/sys-i386/sysdep/skas_ptrace.h)0
-rw-r--r--arch/um/sys-i386/shared/sysdep/stub.h (renamed from arch/um/sys-i386/sysdep/stub.h)0
-rw-r--r--arch/um/sys-i386/shared/sysdep/syscalls.h (renamed from arch/um/sys-i386/sysdep/syscalls.h)0
-rw-r--r--arch/um/sys-i386/shared/sysdep/system.h (renamed from arch/um/sys-i386/sysdep/system.h)0
-rw-r--r--arch/um/sys-i386/shared/sysdep/tls.h (renamed from arch/um/sys-i386/sysdep/tls.h)0
-rw-r--r--arch/um/sys-i386/shared/sysdep/vm-flags.h (renamed from arch/um/sys-i386/sysdep/vm-flags.h)0
-rw-r--r--arch/um/sys-ppc/asm/archparam.h (renamed from arch/um/include/asm/archparam-ppc.h)0
-rw-r--r--arch/um/sys-ppc/asm/elf.h (renamed from arch/um/include/asm/elf-ppc.h)0
-rw-r--r--arch/um/sys-ppc/asm/processor.h (renamed from arch/um/include/asm/processor-ppc.h)0
-rw-r--r--arch/um/sys-ppc/shared/sysdep/ptrace.h (renamed from arch/um/sys-ppc/sysdep/ptrace.h)0
-rw-r--r--arch/um/sys-ppc/shared/sysdep/sigcontext.h (renamed from arch/um/sys-ppc/sysdep/sigcontext.h)0
-rw-r--r--arch/um/sys-ppc/shared/sysdep/skas_ptrace.h (renamed from arch/um/sys-ppc/sysdep/skas_ptrace.h)0
-rw-r--r--arch/um/sys-ppc/shared/sysdep/syscalls.h (renamed from arch/um/sys-ppc/sysdep/syscalls.h)0
-rw-r--r--arch/um/sys-x86_64/asm/archparam.h (renamed from arch/um/include/asm/archparam-x86_64.h)0
-rw-r--r--arch/um/sys-x86_64/asm/elf.h (renamed from arch/um/include/asm/elf-x86_64.h)0
-rw-r--r--arch/um/sys-x86_64/asm/module.h (renamed from arch/um/include/asm/module-x86_64.h)0
-rw-r--r--arch/um/sys-x86_64/asm/processor.h (renamed from arch/um/include/asm/processor-x86_64.h)0
-rw-r--r--arch/um/sys-x86_64/asm/ptrace.h (renamed from arch/um/include/asm/ptrace-x86_64.h)0
-rw-r--r--arch/um/sys-x86_64/shared/sysdep/archsetjmp.h (renamed from arch/um/sys-x86_64/sysdep/archsetjmp.h)0
-rw-r--r--arch/um/sys-x86_64/shared/sysdep/barrier.h (renamed from arch/um/sys-x86_64/sysdep/barrier.h)0
-rw-r--r--arch/um/sys-x86_64/shared/sysdep/checksum.h (renamed from arch/um/sys-x86_64/sysdep/checksum.h)0
-rw-r--r--arch/um/sys-x86_64/shared/sysdep/faultinfo.h (renamed from arch/um/sys-x86_64/sysdep/faultinfo.h)0
-rw-r--r--arch/um/sys-x86_64/shared/sysdep/host_ldt.h (renamed from arch/um/sys-x86_64/sysdep/host_ldt.h)0
-rw-r--r--arch/um/sys-x86_64/shared/sysdep/kernel-offsets.h (renamed from arch/um/sys-x86_64/sysdep/kernel-offsets.h)0
-rw-r--r--arch/um/sys-x86_64/shared/sysdep/ptrace.h (renamed from arch/um/sys-x86_64/sysdep/ptrace.h)0
-rw-r--r--arch/um/sys-x86_64/shared/sysdep/ptrace_user.h (renamed from arch/um/sys-x86_64/sysdep/ptrace_user.h)0
-rw-r--r--arch/um/sys-x86_64/shared/sysdep/sc.h (renamed from arch/um/sys-x86_64/sysdep/sc.h)0
-rw-r--r--arch/um/sys-x86_64/shared/sysdep/sigcontext.h (renamed from arch/um/sys-x86_64/sysdep/sigcontext.h)0
-rw-r--r--arch/um/sys-x86_64/shared/sysdep/skas_ptrace.h (renamed from arch/um/sys-x86_64/sysdep/skas_ptrace.h)0
-rw-r--r--arch/um/sys-x86_64/shared/sysdep/stub.h (renamed from arch/um/sys-x86_64/sysdep/stub.h)0
-rw-r--r--arch/um/sys-x86_64/shared/sysdep/syscalls.h (renamed from arch/um/sys-x86_64/sysdep/syscalls.h)0
-rw-r--r--arch/um/sys-x86_64/shared/sysdep/system.h (renamed from arch/um/sys-x86_64/sysdep/system.h)0
-rw-r--r--arch/um/sys-x86_64/shared/sysdep/tls.h (renamed from arch/um/sys-x86_64/sysdep/tls.h)0
-rw-r--r--arch/um/sys-x86_64/shared/sysdep/vm-flags.h (renamed from arch/um/sys-x86_64/sysdep/vm-flags.h)0
50 files changed, 5 insertions, 19 deletions
diff --git a/arch/um/Makefile b/arch/um/Makefile
index bc070cef3ce..2606bdaefcb 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -18,28 +18,23 @@ core-y += $(ARCH_DIR)/kernel/ \
$(ARCH_DIR)/drivers/ \
$(ARCH_DIR)/os-$(OS)/
-# Have to precede the include because the included Makefiles reference them.
-SYMLINK_HEADERS := archparam.h processor.h ptrace.h module.h elf.h
-SYMLINK_HEADERS := $(foreach header,$(SYMLINK_HEADERS),$(ARCH_DIR)/include/asm/$(header))
-
# XXX: The "os" symlink is only used by arch/um/include/os.h, which includes
# ../os/include/file.h
#
# These are cleaned up during mrproper. Please DO NOT fix it again, this is
# the Correct Thing(tm) to do!
-ARCH_SYMLINKS = $(ARCH_DIR)/os \
- $(SYMLINK_HEADERS) $(ARCH_DIR)/include/shared/uml-config.h
+ARCH_SYMLINKS = $(ARCH_DIR)/os $(ARCH_DIR)/include/shared/uml-config.h
MODE_INCLUDE += -I$(srctree)/$(ARCH_DIR)/include/shared/skas
include $(srctree)/$(ARCH_DIR)/Makefile-skas
-ARCH_INCLUDE := -I$(ARCH_DIR)/include/shared
+ARCH_INCLUDE := -I$(srctree)/$(ARCH_DIR)/include/shared
+ARCH_INCLUDE += -I$(srctree)/$(ARCH_DIR)/sys-$(SUBARCH)/shared
ifneq ($(KBUILD_SRC),)
-ARCH_INCLUDE += -I$(srctree)/$(ARCH_DIR)/include/shared
-KBUILD_CPPFLAGS += -I$(ARCH_DIR)/include # for SYMLINK_HEADERS
+ARCH_INCLUDE += -I$(ARCH_DIR)/include/shared # for three generated files
endif
-ARCH_INCLUDE += -I$(srctree)/$(ARCH_DIR)/sys-$(SUBARCH) # for sysdep
+KBUILD_CPPFLAGS += -I$(srctree)/$(ARCH_DIR)/sys-$(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.
@@ -144,15 +139,6 @@ archclean:
@find . \( -name '*.bb' -o -name '*.bbg' -o -name '*.da' \
-o -name '*.gcov' \) -type f -print | xargs rm -f
-$(SYMLINK_HEADERS):
- @echo ' SYMLINK $@'
-ifneq ($(KBUILD_SRC),)
- $(Q)mkdir -p $(objtree)/$(ARCH_DIR)/include/asm
- $(Q)ln -fsn $(srctree)/$(ARCH_DIR)/include/asm/$(basename $(notdir $@))-$(SUBARCH)$(suffix $@) $@
-else
- $(Q)ln -sf $(basename $(notdir $@))-$(SUBARCH)$(suffix $@) $@
-endif
-
$(objtree)/$(ARCH_DIR)/include/shared:
@echo ' MKDIR $@'
$(Q)mkdir -p $@
diff --git a/arch/um/include/asm/archparam-i386.h b/arch/um/sys-i386/asm/archparam.h
index 93fd723344e..93fd723344e 100644
--- a/arch/um/include/asm/archparam-i386.h
+++ b/arch/um/sys-i386/asm/archparam.h
diff --git a/arch/um/include/asm/elf-i386.h b/arch/um/sys-i386/asm/elf.h
index d0da9d7c537..d0da9d7c537 100644
--- a/arch/um/include/asm/elf-i386.h
+++ b/arch/um/sys-i386/asm/elf.h
diff --git a/arch/um/include/asm/module-i386.h b/arch/um/sys-i386/asm/module.h
index 5ead4a0b2e3..5ead4a0b2e3 100644
--- a/arch/um/include/asm/module-i386.h
+++ b/arch/um/sys-i386/asm/module.h
diff --git a/arch/um/include/asm/processor-i386.h b/arch/um/sys-i386/asm/processor.h
index 82a9061ab5b..82a9061ab5b 100644
--- a/arch/um/include/asm/processor-i386.h
+++ b/arch/um/sys-i386/asm/processor.h
diff --git a/arch/um/include/asm/ptrace-i386.h b/arch/um/sys-i386/asm/ptrace.h
index 0273e4d09af..0273e4d09af 100644
--- a/arch/um/include/asm/ptrace-i386.h
+++ b/arch/um/sys-i386/asm/ptrace.h
diff --git a/arch/um/sys-i386/sysdep/archsetjmp.h b/arch/um/sys-i386/shared/sysdep/archsetjmp.h
index 0f312085ce1..0f312085ce1 100644
--- a/arch/um/sys-i386/sysdep/archsetjmp.h
+++ b/arch/um/sys-i386/shared/sysdep/archsetjmp.h
diff --git a/arch/um/sys-i386/sysdep/barrier.h b/arch/um/sys-i386/shared/sysdep/barrier.h
index b58d52c5b2f..b58d52c5b2f 100644
--- a/arch/um/sys-i386/sysdep/barrier.h
+++ b/arch/um/sys-i386/shared/sysdep/barrier.h
diff --git a/arch/um/sys-i386/sysdep/checksum.h b/arch/um/sys-i386/shared/sysdep/checksum.h
index 0cb4645cbeb..0cb4645cbeb 100644
--- a/arch/um/sys-i386/sysdep/checksum.h
+++ b/arch/um/sys-i386/shared/sysdep/checksum.h
diff --git a/arch/um/sys-i386/sysdep/faultinfo.h b/arch/um/sys-i386/shared/sysdep/faultinfo.h
index db437cc373b..db437cc373b 100644
--- a/arch/um/sys-i386/sysdep/faultinfo.h
+++ b/arch/um/sys-i386/shared/sysdep/faultinfo.h
diff --git a/arch/um/sys-i386/sysdep/host_ldt.h b/arch/um/sys-i386/shared/sysdep/host_ldt.h
index 0953cc4df65..0953cc4df65 100644
--- a/arch/um/sys-i386/sysdep/host_ldt.h
+++ b/arch/um/sys-i386/shared/sysdep/host_ldt.h
diff --git a/arch/um/sys-i386/sysdep/kernel-offsets.h b/arch/um/sys-i386/shared/sysdep/kernel-offsets.h
index 5868526b5ee..5868526b5ee 100644
--- a/arch/um/sys-i386/sysdep/kernel-offsets.h
+++ b/arch/um/sys-i386/shared/sysdep/kernel-offsets.h
diff --git a/arch/um/sys-i386/sysdep/ptrace.h b/arch/um/sys-i386/shared/sysdep/ptrace.h
index 11c08969d13..11c08969d13 100644
--- a/arch/um/sys-i386/sysdep/ptrace.h
+++ b/arch/um/sys-i386/shared/sysdep/ptrace.h
diff --git a/arch/um/sys-i386/sysdep/ptrace_user.h b/arch/um/sys-i386/shared/sysdep/ptrace_user.h
index ef56247e414..ef56247e414 100644
--- a/arch/um/sys-i386/sysdep/ptrace_user.h
+++ b/arch/um/sys-i386/shared/sysdep/ptrace_user.h
diff --git a/arch/um/sys-i386/sysdep/sc.h b/arch/um/sys-i386/shared/sysdep/sc.h
index c57d1780ad3..c57d1780ad3 100644
--- a/arch/um/sys-i386/sysdep/sc.h
+++ b/arch/um/sys-i386/shared/sysdep/sc.h
diff --git a/arch/um/sys-i386/sysdep/sigcontext.h b/arch/um/sys-i386/shared/sysdep/sigcontext.h
index f583c87111a..f583c87111a 100644
--- a/arch/um/sys-i386/sysdep/sigcontext.h
+++ b/arch/um/sys-i386/shared/sysdep/sigcontext.h
diff --git a/arch/um/sys-i386/sysdep/skas_ptrace.h b/arch/um/sys-i386/shared/sysdep/skas_ptrace.h
index e27b8a79177..e27b8a79177 100644
--- a/arch/um/sys-i386/sysdep/skas_ptrace.h
+++ b/arch/um/sys-i386/shared/sysdep/skas_ptrace.h
diff --git a/arch/um/sys-i386/sysdep/stub.h b/arch/um/sys-i386/shared/sysdep/stub.h
index 8c097b87fca..8c097b87fca 100644
--- a/arch/um/sys-i386/sysdep/stub.h
+++ b/arch/um/sys-i386/shared/sysdep/stub.h
diff --git a/arch/um/sys-i386/sysdep/syscalls.h b/arch/um/sys-i386/shared/sysdep/syscalls.h
index 905698197e3..905698197e3 100644
--- a/arch/um/sys-i386/sysdep/syscalls.h
+++ b/arch/um/sys-i386/shared/sysdep/syscalls.h
diff --git a/arch/um/sys-i386/sysdep/system.h b/arch/um/sys-i386/shared/sysdep/system.h
index d1b93c43620..d1b93c43620 100644
--- a/arch/um/sys-i386/sysdep/system.h
+++ b/arch/um/sys-i386/shared/sysdep/system.h
diff --git a/arch/um/sys-i386/sysdep/tls.h b/arch/um/sys-i386/shared/sysdep/tls.h
index 34550755b2a..34550755b2a 100644
--- a/arch/um/sys-i386/sysdep/tls.h
+++ b/arch/um/sys-i386/shared/sysdep/tls.h
diff --git a/arch/um/sys-i386/sysdep/vm-flags.h b/arch/um/sys-i386/shared/sysdep/vm-flags.h
index e0d24c568db..e0d24c568db 100644
--- a/arch/um/sys-i386/sysdep/vm-flags.h
+++ b/arch/um/sys-i386/shared/sysdep/vm-flags.h
diff --git a/arch/um/include/asm/archparam-ppc.h b/arch/um/sys-ppc/asm/archparam.h
index 4269d8a37b4..4269d8a37b4 100644
--- a/arch/um/include/asm/archparam-ppc.h
+++ b/arch/um/sys-ppc/asm/archparam.h
diff --git a/arch/um/include/asm/elf-ppc.h b/arch/um/sys-ppc/asm/elf.h
index af9463cd8ce..af9463cd8ce 100644
--- a/arch/um/include/asm/elf-ppc.h
+++ b/arch/um/sys-ppc/asm/elf.h
diff --git a/arch/um/include/asm/processor-ppc.h b/arch/um/sys-ppc/asm/processor.h
index 95932315122..95932315122 100644
--- a/arch/um/include/asm/processor-ppc.h
+++ b/arch/um/sys-ppc/asm/processor.h
diff --git a/arch/um/sys-ppc/sysdep/ptrace.h b/arch/um/sys-ppc/shared/sysdep/ptrace.h
index df2397dba3e..df2397dba3e 100644
--- a/arch/um/sys-ppc/sysdep/ptrace.h
+++ b/arch/um/sys-ppc/shared/sysdep/ptrace.h
diff --git a/arch/um/sys-ppc/sysdep/sigcontext.h b/arch/um/sys-ppc/shared/sysdep/sigcontext.h
index f20d965de9c..f20d965de9c 100644
--- a/arch/um/sys-ppc/sysdep/sigcontext.h
+++ b/arch/um/sys-ppc/shared/sysdep/sigcontext.h
diff --git a/arch/um/sys-ppc/sysdep/skas_ptrace.h b/arch/um/sys-ppc/shared/sysdep/skas_ptrace.h
index d9fbbac10de..d9fbbac10de 100644
--- a/arch/um/sys-ppc/sysdep/skas_ptrace.h
+++ b/arch/um/sys-ppc/shared/sysdep/skas_ptrace.h
diff --git a/arch/um/sys-ppc/sysdep/syscalls.h b/arch/um/sys-ppc/shared/sysdep/syscalls.h
index 679df351e19..679df351e19 100644
--- a/arch/um/sys-ppc/sysdep/syscalls.h
+++ b/arch/um/sys-ppc/shared/sysdep/syscalls.h
diff --git a/arch/um/include/asm/archparam-x86_64.h b/arch/um/sys-x86_64/asm/archparam.h
index 270ed9586b6..270ed9586b6 100644
--- a/arch/um/include/asm/archparam-x86_64.h
+++ b/arch/um/sys-x86_64/asm/archparam.h
diff --git a/arch/um/include/asm/elf-x86_64.h b/arch/um/sys-x86_64/asm/elf.h
index 6e8a9195e95..6e8a9195e95 100644
--- a/arch/um/include/asm/elf-x86_64.h
+++ b/arch/um/sys-x86_64/asm/elf.h
diff --git a/arch/um/include/asm/module-x86_64.h b/arch/um/sys-x86_64/asm/module.h
index 35b5491d3e9..35b5491d3e9 100644
--- a/arch/um/include/asm/module-x86_64.h
+++ b/arch/um/sys-x86_64/asm/module.h
diff --git a/arch/um/include/asm/processor-x86_64.h b/arch/um/sys-x86_64/asm/processor.h
index 875a26a6261..875a26a6261 100644
--- a/arch/um/include/asm/processor-x86_64.h
+++ b/arch/um/sys-x86_64/asm/processor.h
diff --git a/arch/um/include/asm/ptrace-x86_64.h b/arch/um/sys-x86_64/asm/ptrace.h
index 83d8c473b90..83d8c473b90 100644
--- a/arch/um/include/asm/ptrace-x86_64.h
+++ b/arch/um/sys-x86_64/asm/ptrace.h
diff --git a/arch/um/sys-x86_64/sysdep/archsetjmp.h b/arch/um/sys-x86_64/shared/sysdep/archsetjmp.h
index 2af8f12ca16..2af8f12ca16 100644
--- a/arch/um/sys-x86_64/sysdep/archsetjmp.h
+++ b/arch/um/sys-x86_64/shared/sysdep/archsetjmp.h
diff --git a/arch/um/sys-x86_64/sysdep/barrier.h b/arch/um/sys-x86_64/shared/sysdep/barrier.h
index 7b610befdc8..7b610befdc8 100644
--- a/arch/um/sys-x86_64/sysdep/barrier.h
+++ b/arch/um/sys-x86_64/shared/sysdep/barrier.h
diff --git a/arch/um/sys-x86_64/sysdep/checksum.h b/arch/um/sys-x86_64/shared/sysdep/checksum.h
index a5be9031ea8..a5be9031ea8 100644
--- a/arch/um/sys-x86_64/sysdep/checksum.h
+++ b/arch/um/sys-x86_64/shared/sysdep/checksum.h
diff --git a/arch/um/sys-x86_64/sysdep/faultinfo.h b/arch/um/sys-x86_64/shared/sysdep/faultinfo.h
index cb917b0d566..cb917b0d566 100644
--- a/arch/um/sys-x86_64/sysdep/faultinfo.h
+++ b/arch/um/sys-x86_64/shared/sysdep/faultinfo.h
diff --git a/arch/um/sys-x86_64/sysdep/host_ldt.h b/arch/um/sys-x86_64/shared/sysdep/host_ldt.h
index e8b1be1e154..e8b1be1e154 100644
--- a/arch/um/sys-x86_64/sysdep/host_ldt.h
+++ b/arch/um/sys-x86_64/shared/sysdep/host_ldt.h
diff --git a/arch/um/sys-x86_64/sysdep/kernel-offsets.h b/arch/um/sys-x86_64/shared/sysdep/kernel-offsets.h
index a307237b796..a307237b796 100644
--- a/arch/um/sys-x86_64/sysdep/kernel-offsets.h
+++ b/arch/um/sys-x86_64/shared/sysdep/kernel-offsets.h
diff --git a/arch/um/sys-x86_64/sysdep/ptrace.h b/arch/um/sys-x86_64/shared/sysdep/ptrace.h
index 9ea44d111f3..9ea44d111f3 100644
--- a/arch/um/sys-x86_64/sysdep/ptrace.h
+++ b/arch/um/sys-x86_64/shared/sysdep/ptrace.h
diff --git a/arch/um/sys-x86_64/sysdep/ptrace_user.h b/arch/um/sys-x86_64/shared/sysdep/ptrace_user.h
index 4dbccdb58f4..4dbccdb58f4 100644
--- a/arch/um/sys-x86_64/sysdep/ptrace_user.h
+++ b/arch/um/sys-x86_64/shared/sysdep/ptrace_user.h
diff --git a/arch/um/sys-x86_64/sysdep/sc.h b/arch/um/sys-x86_64/shared/sysdep/sc.h
index 8aee45b0743..8aee45b0743 100644
--- a/arch/um/sys-x86_64/sysdep/sc.h
+++ b/arch/um/sys-x86_64/shared/sysdep/sc.h
diff --git a/arch/um/sys-x86_64/sysdep/sigcontext.h b/arch/um/sys-x86_64/shared/sysdep/sigcontext.h
index 0155133b145..0155133b145 100644
--- a/arch/um/sys-x86_64/sysdep/sigcontext.h
+++ b/arch/um/sys-x86_64/shared/sysdep/sigcontext.h
diff --git a/arch/um/sys-x86_64/sysdep/skas_ptrace.h b/arch/um/sys-x86_64/shared/sysdep/skas_ptrace.h
index 95db4be786e..95db4be786e 100644
--- a/arch/um/sys-x86_64/sysdep/skas_ptrace.h
+++ b/arch/um/sys-x86_64/shared/sysdep/skas_ptrace.h
diff --git a/arch/um/sys-x86_64/sysdep/stub.h b/arch/um/sys-x86_64/shared/sysdep/stub.h
index 655f9c2de3a..655f9c2de3a 100644
--- a/arch/um/sys-x86_64/sysdep/stub.h
+++ b/arch/um/sys-x86_64/shared/sysdep/stub.h
diff --git a/arch/um/sys-x86_64/sysdep/syscalls.h b/arch/um/sys-x86_64/shared/sysdep/syscalls.h
index 7cfb0b08565..7cfb0b08565 100644
--- a/arch/um/sys-x86_64/sysdep/syscalls.h
+++ b/arch/um/sys-x86_64/shared/sysdep/syscalls.h
diff --git a/arch/um/sys-x86_64/sysdep/system.h b/arch/um/sys-x86_64/shared/sysdep/system.h
index d1b93c43620..d1b93c43620 100644
--- a/arch/um/sys-x86_64/sysdep/system.h
+++ b/arch/um/sys-x86_64/shared/sysdep/system.h
diff --git a/arch/um/sys-x86_64/sysdep/tls.h b/arch/um/sys-x86_64/shared/sysdep/tls.h
index 18c000d0357..18c000d0357 100644
--- a/arch/um/sys-x86_64/sysdep/tls.h
+++ b/arch/um/sys-x86_64/shared/sysdep/tls.h
diff --git a/arch/um/sys-x86_64/sysdep/vm-flags.h b/arch/um/sys-x86_64/shared/sysdep/vm-flags.h
index 3213edfa788..3213edfa788 100644
--- a/arch/um/sys-x86_64/sysdep/vm-flags.h
+++ b/arch/um/sys-x86_64/shared/sysdep/vm-flags.h