---

yaml
---
r: 117434
b: refs/heads/master
c: f5ad6a4
h: refs/heads/master
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 17dcf75d3ea11d7e26110ba85677cfadbccecf45
+refs/heads/master: f5ad6a42b700d9687bb97cf461e7f2506e3006d6

trunk/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),)