x86, um: get rid of sysdep symlink

Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>

41 files changed, 2 insertions, 10 deletions

diff --git a/arch/um/Makefile b/arch/um/Makefile
index 3af8c81bf4f0..2e042b0e3b8a 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -27,7 +27,7 @@ SYMLINK_HEADERS := $(foreach header,$(SYMLINK_HEADERS),$(ARCH_DIR)/include/asm/$
 #
 # These are cleaned up during mrproper. Please DO NOT fix it again, this is
 # the Correct Thing(tm) to do!
-ARCH_SYMLINKS = $(ARCH_DIR)/include/shared/sysdep $(ARCH_DIR)/os \
+ARCH_SYMLINKS = $(ARCH_DIR)/os \
 	$(SYMLINK_HEADERS) $(ARCH_DIR)/include/shared/uml-config.h
 
 MODE_INCLUDE	+= -I$(srctree)/$(ARCH_DIR)/include/shared/skas
@@ -39,7 +39,7 @@ ifneq ($(KBUILD_SRC),)
 ARCH_INCLUDE	+= -I$(srctree)/$(ARCH_DIR)/include/shared
 KBUILD_CPPFLAGS	+= -I$(ARCH_DIR)/include # for SYMLINK_HEADERS
 endif
-SYS_DIR		:= $(ARCH_DIR)/include/shared/sysdep-$(SUBARCH)
+ARCH_INCLUDE	+= -I$(srctree)/$(ARCH_DIR)/sys-$(SUBARCH) # for sysdep
 
 # -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.
@@ -157,14 +157,6 @@ $(objtree)/$(ARCH_DIR)/include/shared:
 	@echo '  MKDIR $@'
 	$(Q)mkdir -p $@
 
-$(ARCH_DIR)/include/shared/sysdep: $(objtree)/$(ARCH_DIR)/include/shared
-	@echo '  SYMLINK $@'
-ifneq ($(KBUILD_SRC),)
-	$(Q)ln -fsn $(srctree)/$(ARCH_DIR)/include/shared/sysdep-$(SUBARCH) $@
-else
-	$(Q)ln -fsn sysdep-$(SUBARCH) $@
-endif
-
 $(ARCH_DIR)/os:
 	@echo '  SYMLINK $@'
 ifneq ($(KBUILD_SRC),)
diff --git a/arch/um/include/shared/sysdep-i386/archsetjmp.h b/arch/um/sys-i386/sysdep/archsetjmp.h
index 0f312085ce1d..0f312085ce1d 100644
--- a/arch/um/include/shared/sysdep-i386/archsetjmp.h
+++ b/arch/um/sys-i386/sysdep/archsetjmp.h
diff --git a/arch/um/include/shared/sysdep-i386/barrier.h b/arch/um/sys-i386/sysdep/barrier.h
index b58d52c5b2f4..b58d52c5b2f4 100644
--- a/arch/um/include/shared/sysdep-i386/barrier.h
+++ b/arch/um/sys-i386/sysdep/barrier.h
diff --git a/arch/um/include/shared/sysdep-i386/checksum.h b/arch/um/sys-i386/sysdep/checksum.h
index 0cb4645cbeb8..0cb4645cbeb8 100644
--- a/arch/um/include/shared/sysdep-i386/checksum.h
+++ b/arch/um/sys-i386/sysdep/checksum.h
diff --git a/arch/um/include/shared/sysdep-i386/faultinfo.h b/arch/um/sys-i386/sysdep/faultinfo.h
index db437cc373bc..db437cc373bc 100644
--- a/arch/um/include/shared/sysdep-i386/faultinfo.h
+++ b/arch/um/sys-i386/sysdep/faultinfo.h
diff --git a/arch/um/include/shared/sysdep-i386/host_ldt.h b/arch/um/sys-i386/sysdep/host_ldt.h
index 0953cc4df652..0953cc4df652 100644
--- a/arch/um/include/shared/sysdep-i386/host_ldt.h
+++ b/arch/um/sys-i386/sysdep/host_ldt.h
diff --git a/arch/um/include/shared/sysdep-i386/kernel-offsets.h b/arch/um/sys-i386/sysdep/kernel-offsets.h
index 5868526b5eef..5868526b5eef 100644
--- a/arch/um/include/shared/sysdep-i386/kernel-offsets.h
+++ b/arch/um/sys-i386/sysdep/kernel-offsets.h
diff --git a/arch/um/include/shared/sysdep-i386/ptrace.h b/arch/um/sys-i386/sysdep/ptrace.h
index 11c08969d134..11c08969d134 100644
--- a/arch/um/include/shared/sysdep-i386/ptrace.h
+++ b/arch/um/sys-i386/sysdep/ptrace.h
diff --git a/arch/um/include/shared/sysdep-i386/ptrace_user.h b/arch/um/sys-i386/sysdep/ptrace_user.h
index ef56247e4143..ef56247e4143 100644
--- a/arch/um/include/shared/sysdep-i386/ptrace_user.h
+++ b/arch/um/sys-i386/sysdep/ptrace_user.h
diff --git a/arch/um/include/shared/sysdep-i386/sc.h b/arch/um/sys-i386/sysdep/sc.h
index c57d1780ad37..c57d1780ad37 100644
--- a/arch/um/include/shared/sysdep-i386/sc.h
+++ b/arch/um/sys-i386/sysdep/sc.h
diff --git a/arch/um/include/shared/sysdep-i386/sigcontext.h b/arch/um/sys-i386/sysdep/sigcontext.h
index f583c87111a0..f583c87111a0 100644
--- a/arch/um/include/shared/sysdep-i386/sigcontext.h
+++ b/arch/um/sys-i386/sysdep/sigcontext.h
diff --git a/arch/um/include/shared/sysdep-i386/skas_ptrace.h b/arch/um/sys-i386/sysdep/skas_ptrace.h
index e27b8a791773..e27b8a791773 100644
--- a/arch/um/include/shared/sysdep-i386/skas_ptrace.h
+++ b/arch/um/sys-i386/sysdep/skas_ptrace.h
diff --git a/arch/um/include/shared/sysdep-i386/stub.h b/arch/um/sys-i386/sysdep/stub.h
index 8c097b87fca7..8c097b87fca7 100644
--- a/arch/um/include/shared/sysdep-i386/stub.h
+++ b/arch/um/sys-i386/sysdep/stub.h
diff --git a/arch/um/include/shared/sysdep-i386/syscalls.h b/arch/um/sys-i386/sysdep/syscalls.h
index 905698197e35..905698197e35 100644
--- a/arch/um/include/shared/sysdep-i386/syscalls.h
+++ b/arch/um/sys-i386/sysdep/syscalls.h
diff --git a/arch/um/include/shared/sysdep-i386/system.h b/arch/um/sys-i386/sysdep/system.h
index d1b93c436200..d1b93c436200 100644
--- a/arch/um/include/shared/sysdep-i386/system.h
+++ b/arch/um/sys-i386/sysdep/system.h
diff --git a/arch/um/include/shared/sysdep-i386/tls.h b/arch/um/sys-i386/sysdep/tls.h
index 34550755b2a1..34550755b2a1 100644
--- a/arch/um/include/shared/sysdep-i386/tls.h
+++ b/arch/um/sys-i386/sysdep/tls.h
diff --git a/arch/um/include/shared/sysdep-i386/vm-flags.h b/arch/um/sys-i386/sysdep/vm-flags.h
index e0d24c568dbc..e0d24c568dbc 100644
--- a/arch/um/include/shared/sysdep-i386/vm-flags.h
+++ b/arch/um/sys-i386/sysdep/vm-flags.h
diff --git a/arch/um/include/shared/sysdep-ia64/ptrace.h b/arch/um/sys-ia64/sysdep/ptrace.h
index 42dd8fb6f2f9..42dd8fb6f2f9 100644
--- a/arch/um/include/shared/sysdep-ia64/ptrace.h
+++ b/arch/um/sys-ia64/sysdep/ptrace.h
diff --git a/arch/um/include/shared/sysdep-ia64/sigcontext.h b/arch/um/sys-ia64/sysdep/sigcontext.h
index f15fb25260ba..f15fb25260ba 100644
--- a/arch/um/include/shared/sysdep-ia64/sigcontext.h
+++ b/arch/um/sys-ia64/sysdep/sigcontext.h
diff --git a/arch/um/include/shared/sysdep-ia64/skas_ptrace.h b/arch/um/sys-ia64/sysdep/skas_ptrace.h
index 25a38e715702..25a38e715702 100644
--- a/arch/um/include/shared/sysdep-ia64/skas_ptrace.h
+++ b/arch/um/sys-ia64/sysdep/skas_ptrace.h
diff --git a/arch/um/include/shared/sysdep-ia64/syscalls.h b/arch/um/sys-ia64/sysdep/syscalls.h
index 4a1f46ef1ebc..4a1f46ef1ebc 100644
--- a/arch/um/include/shared/sysdep-ia64/syscalls.h
+++ b/arch/um/sys-ia64/sysdep/syscalls.h
diff --git a/arch/um/include/shared/sysdep-ppc/ptrace.h b/arch/um/sys-ppc/sysdep/ptrace.h
index df2397dba3e5..df2397dba3e5 100644
--- a/arch/um/include/shared/sysdep-ppc/ptrace.h
+++ b/arch/um/sys-ppc/sysdep/ptrace.h
diff --git a/arch/um/include/shared/sysdep-ppc/sigcontext.h b/arch/um/sys-ppc/sysdep/sigcontext.h
index f20d965de9c7..f20d965de9c7 100644
--- a/arch/um/include/shared/sysdep-ppc/sigcontext.h
+++ b/arch/um/sys-ppc/sysdep/sigcontext.h
diff --git a/arch/um/include/shared/sysdep-ppc/skas_ptrace.h b/arch/um/sys-ppc/sysdep/skas_ptrace.h
index d9fbbac10de0..d9fbbac10de0 100644
--- a/arch/um/include/shared/sysdep-ppc/skas_ptrace.h
+++ b/arch/um/sys-ppc/sysdep/skas_ptrace.h
diff --git a/arch/um/include/shared/sysdep-ppc/syscalls.h b/arch/um/sys-ppc/sysdep/syscalls.h
index 679df351e19b..679df351e19b 100644
--- a/arch/um/include/shared/sysdep-ppc/syscalls.h
+++ b/arch/um/sys-ppc/sysdep/syscalls.h
diff --git a/arch/um/include/shared/sysdep-x86_64/archsetjmp.h b/arch/um/sys-x86_64/sysdep/archsetjmp.h
index 2af8f12ca161..2af8f12ca161 100644
--- a/arch/um/include/shared/sysdep-x86_64/archsetjmp.h
+++ b/arch/um/sys-x86_64/sysdep/archsetjmp.h
diff --git a/arch/um/include/shared/sysdep-x86_64/barrier.h b/arch/um/sys-x86_64/sysdep/barrier.h
index 7b610befdc8f..7b610befdc8f 100644
--- a/arch/um/include/shared/sysdep-x86_64/barrier.h
+++ b/arch/um/sys-x86_64/sysdep/barrier.h
diff --git a/arch/um/include/shared/sysdep-x86_64/checksum.h b/arch/um/sys-x86_64/sysdep/checksum.h
index a5be9031ea85..a5be9031ea85 100644
--- a/arch/um/include/shared/sysdep-x86_64/checksum.h
+++ b/arch/um/sys-x86_64/sysdep/checksum.h
diff --git a/arch/um/include/shared/sysdep-x86_64/faultinfo.h b/arch/um/sys-x86_64/sysdep/faultinfo.h
index cb917b0d5660..cb917b0d5660 100644
--- a/arch/um/include/shared/sysdep-x86_64/faultinfo.h
+++ b/arch/um/sys-x86_64/sysdep/faultinfo.h
diff --git a/arch/um/include/shared/sysdep-x86_64/host_ldt.h b/arch/um/sys-x86_64/sysdep/host_ldt.h
index e8b1be1e154f..e8b1be1e154f 100644
--- a/arch/um/include/shared/sysdep-x86_64/host_ldt.h
+++ b/arch/um/sys-x86_64/sysdep/host_ldt.h
diff --git a/arch/um/include/shared/sysdep-x86_64/kernel-offsets.h b/arch/um/sys-x86_64/sysdep/kernel-offsets.h
index a307237b7964..a307237b7964 100644
--- a/arch/um/include/shared/sysdep-x86_64/kernel-offsets.h
+++ b/arch/um/sys-x86_64/sysdep/kernel-offsets.h
diff --git a/arch/um/include/shared/sysdep-x86_64/ptrace.h b/arch/um/sys-x86_64/sysdep/ptrace.h
index 9ea44d111f33..9ea44d111f33 100644
--- a/arch/um/include/shared/sysdep-x86_64/ptrace.h
+++ b/arch/um/sys-x86_64/sysdep/ptrace.h
diff --git a/arch/um/include/shared/sysdep-x86_64/ptrace_user.h b/arch/um/sys-x86_64/sysdep/ptrace_user.h
index 4dbccdb58f48..4dbccdb58f48 100644
--- a/arch/um/include/shared/sysdep-x86_64/ptrace_user.h
+++ b/arch/um/sys-x86_64/sysdep/ptrace_user.h
diff --git a/arch/um/include/shared/sysdep-x86_64/sc.h b/arch/um/sys-x86_64/sysdep/sc.h
index 8aee45b07434..8aee45b07434 100644
--- a/arch/um/include/shared/sysdep-x86_64/sc.h
+++ b/arch/um/sys-x86_64/sysdep/sc.h
diff --git a/arch/um/include/shared/sysdep-x86_64/sigcontext.h b/arch/um/sys-x86_64/sysdep/sigcontext.h
index 0155133b1458..0155133b1458 100644
--- a/arch/um/include/shared/sysdep-x86_64/sigcontext.h
+++ b/arch/um/sys-x86_64/sysdep/sigcontext.h
diff --git a/arch/um/include/shared/sysdep-x86_64/skas_ptrace.h b/arch/um/sys-x86_64/sysdep/skas_ptrace.h
index 95db4be786e4..95db4be786e4 100644
--- a/arch/um/include/shared/sysdep-x86_64/skas_ptrace.h
+++ b/arch/um/sys-x86_64/sysdep/skas_ptrace.h
diff --git a/arch/um/include/shared/sysdep-x86_64/stub.h b/arch/um/sys-x86_64/sysdep/stub.h
index 655f9c2de3ac..655f9c2de3ac 100644
--- a/arch/um/include/shared/sysdep-x86_64/stub.h
+++ b/arch/um/sys-x86_64/sysdep/stub.h
diff --git a/arch/um/include/shared/sysdep-x86_64/syscalls.h b/arch/um/sys-x86_64/sysdep/syscalls.h
index 7cfb0b085655..7cfb0b085655 100644
--- a/arch/um/include/shared/sysdep-x86_64/syscalls.h
+++ b/arch/um/sys-x86_64/sysdep/syscalls.h
diff --git a/arch/um/include/shared/sysdep-x86_64/system.h b/arch/um/sys-x86_64/sysdep/system.h
index d1b93c436200..d1b93c436200 100644
--- a/arch/um/include/shared/sysdep-x86_64/system.h
+++ b/arch/um/sys-x86_64/sysdep/system.h
diff --git a/arch/um/include/shared/sysdep-x86_64/tls.h b/arch/um/sys-x86_64/sysdep/tls.h
index 18c000d0357a..18c000d0357a 100644
--- a/arch/um/include/shared/sysdep-x86_64/tls.h
+++ b/arch/um/sys-x86_64/sysdep/tls.h
diff --git a/arch/um/include/shared/sysdep-x86_64/vm-flags.h b/arch/um/sys-x86_64/sysdep/vm-flags.h
index 3213edfa7888..3213edfa7888 100644
--- a/arch/um/include/shared/sysdep-x86_64/vm-flags.h
+++ b/arch/um/sys-x86_64/sysdep/vm-flags.h