41 files changed, 2 insertions, 10 deletions
diff --git a/arch/um/Makefile b/arch/um/Makefile
index 3af8c81..2e042b0 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 0f31208..0f31208 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 b58d52c..b58d52c 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 0cb4645..0cb4645 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 db437cc..db437cc 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 0953cc4..0953cc4 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 5868526..5868526 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 11c0896..11c0896 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 ef56247..ef56247 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 c57d178..c57d178 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 f583c87..f583c87 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 e27b8a7..e27b8a7 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 8c097b8..8c097b8 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 9056981..9056981 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-x86_64/system.h b/arch/um/sys-i386/sysdep/system.h
index d1b93c4..d1b93c4 100644
--- a/arch/um/include/shared/sysdep-x86_64/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 3455075..3455075 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 e0d24c5..e0d24c5 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 42dd8fb..42dd8fb 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 f15fb25..f15fb25 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 25a38e7..25a38e7 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 4a1f46e..4a1f46e 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 df2397d..df2397d 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 f20d965..f20d965 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 d9fbbac..d9fbbac 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 679df35..679df35 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 2af8f12..2af8f12 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 7b610be..7b610be 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 a5be903..a5be903 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 cb917b0..cb917b0 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 e8b1be1..e8b1be1 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 a307237..a307237 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 9ea44d1..9ea44d1 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 4dbccdb..4dbccdb 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 8aee45b..8aee45b 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 0155133..0155133 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 95db4be7..95db4be7 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 655f9c2..655f9c2 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 7cfb0b08..7cfb0b08 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-i386/system.h b/arch/um/sys-x86_64/sysdep/system.h
index d1b93c4..d1b93c4 100644
--- a/arch/um/include/shared/sysdep-i386/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 18c000d..18c000d 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 3213edf..3213edf 100644
--- a/arch/um/include/shared/sysdep-x86_64/vm-flags.h
+++ b/arch/um/sys-x86_64/sysdep/vm-flags.h