浏览代码

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>
Al Viro 17 年之前
父节点
当前提交
f5ad6a42b7
共有 41 个文件被更改,包括 2 次插入10 次删除
  1. 2 10
      arch/um/Makefile
  2. 0 0
      arch/um/sys-i386/sysdep/archsetjmp.h
  3. 0 0
      arch/um/sys-i386/sysdep/barrier.h
  4. 0 0
      arch/um/sys-i386/sysdep/checksum.h
  5. 0 0
      arch/um/sys-i386/sysdep/faultinfo.h
  6. 0 0
      arch/um/sys-i386/sysdep/host_ldt.h
  7. 0 0
      arch/um/sys-i386/sysdep/kernel-offsets.h
  8. 0 0
      arch/um/sys-i386/sysdep/ptrace.h
  9. 0 0
      arch/um/sys-i386/sysdep/ptrace_user.h
  10. 0 0
      arch/um/sys-i386/sysdep/sc.h
  11. 0 0
      arch/um/sys-i386/sysdep/sigcontext.h
  12. 0 0
      arch/um/sys-i386/sysdep/skas_ptrace.h
  13. 0 0
      arch/um/sys-i386/sysdep/stub.h
  14. 0 0
      arch/um/sys-i386/sysdep/syscalls.h
  15. 0 0
      arch/um/sys-i386/sysdep/system.h
  16. 0 0
      arch/um/sys-i386/sysdep/tls.h
  17. 0 0
      arch/um/sys-i386/sysdep/vm-flags.h
  18. 0 0
      arch/um/sys-ia64/sysdep/ptrace.h
  19. 0 0
      arch/um/sys-ia64/sysdep/sigcontext.h
  20. 0 0
      arch/um/sys-ia64/sysdep/skas_ptrace.h
  21. 0 0
      arch/um/sys-ia64/sysdep/syscalls.h
  22. 0 0
      arch/um/sys-ppc/sysdep/ptrace.h
  23. 0 0
      arch/um/sys-ppc/sysdep/sigcontext.h
  24. 0 0
      arch/um/sys-ppc/sysdep/skas_ptrace.h
  25. 0 0
      arch/um/sys-ppc/sysdep/syscalls.h
  26. 0 0
      arch/um/sys-x86_64/sysdep/archsetjmp.h
  27. 0 0
      arch/um/sys-x86_64/sysdep/barrier.h
  28. 0 0
      arch/um/sys-x86_64/sysdep/checksum.h
  29. 0 0
      arch/um/sys-x86_64/sysdep/faultinfo.h
  30. 0 0
      arch/um/sys-x86_64/sysdep/host_ldt.h
  31. 0 0
      arch/um/sys-x86_64/sysdep/kernel-offsets.h
  32. 0 0
      arch/um/sys-x86_64/sysdep/ptrace.h
  33. 0 0
      arch/um/sys-x86_64/sysdep/ptrace_user.h
  34. 0 0
      arch/um/sys-x86_64/sysdep/sc.h
  35. 0 0
      arch/um/sys-x86_64/sysdep/sigcontext.h
  36. 0 0
      arch/um/sys-x86_64/sysdep/skas_ptrace.h
  37. 0 0
      arch/um/sys-x86_64/sysdep/stub.h
  38. 0 0
      arch/um/sys-x86_64/sysdep/syscalls.h
  39. 0 0
      arch/um/sys-x86_64/sysdep/system.h
  40. 0 0
      arch/um/sys-x86_64/sysdep/tls.h
  41. 0 0
      arch/um/sys-x86_64/sysdep/vm-flags.h

+ 2 - 10
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),)

+ 0 - 0
arch/um/include/shared/sysdep-i386/archsetjmp.h → arch/um/sys-i386/sysdep/archsetjmp.h


+ 0 - 0
arch/um/include/shared/sysdep-i386/barrier.h → arch/um/sys-i386/sysdep/barrier.h


+ 0 - 0
arch/um/include/shared/sysdep-i386/checksum.h → arch/um/sys-i386/sysdep/checksum.h


+ 0 - 0
arch/um/include/shared/sysdep-i386/faultinfo.h → arch/um/sys-i386/sysdep/faultinfo.h


+ 0 - 0
arch/um/include/shared/sysdep-i386/host_ldt.h → arch/um/sys-i386/sysdep/host_ldt.h


+ 0 - 0
arch/um/include/shared/sysdep-i386/kernel-offsets.h → arch/um/sys-i386/sysdep/kernel-offsets.h


+ 0 - 0
arch/um/include/shared/sysdep-i386/ptrace.h → arch/um/sys-i386/sysdep/ptrace.h


+ 0 - 0
arch/um/include/shared/sysdep-i386/ptrace_user.h → arch/um/sys-i386/sysdep/ptrace_user.h


+ 0 - 0
arch/um/include/shared/sysdep-i386/sc.h → arch/um/sys-i386/sysdep/sc.h


+ 0 - 0
arch/um/include/shared/sysdep-i386/sigcontext.h → arch/um/sys-i386/sysdep/sigcontext.h


+ 0 - 0
arch/um/include/shared/sysdep-i386/skas_ptrace.h → arch/um/sys-i386/sysdep/skas_ptrace.h


+ 0 - 0
arch/um/include/shared/sysdep-i386/stub.h → arch/um/sys-i386/sysdep/stub.h


+ 0 - 0
arch/um/include/shared/sysdep-i386/syscalls.h → arch/um/sys-i386/sysdep/syscalls.h


+ 0 - 0
arch/um/include/shared/sysdep-i386/system.h → arch/um/sys-i386/sysdep/system.h


+ 0 - 0
arch/um/include/shared/sysdep-i386/tls.h → arch/um/sys-i386/sysdep/tls.h


+ 0 - 0
arch/um/include/shared/sysdep-i386/vm-flags.h → arch/um/sys-i386/sysdep/vm-flags.h


+ 0 - 0
arch/um/include/shared/sysdep-ia64/ptrace.h → arch/um/sys-ia64/sysdep/ptrace.h


+ 0 - 0
arch/um/include/shared/sysdep-ia64/sigcontext.h → arch/um/sys-ia64/sysdep/sigcontext.h


+ 0 - 0
arch/um/include/shared/sysdep-ia64/skas_ptrace.h → arch/um/sys-ia64/sysdep/skas_ptrace.h


+ 0 - 0
arch/um/include/shared/sysdep-ia64/syscalls.h → arch/um/sys-ia64/sysdep/syscalls.h


+ 0 - 0
arch/um/include/shared/sysdep-ppc/ptrace.h → arch/um/sys-ppc/sysdep/ptrace.h


+ 0 - 0
arch/um/include/shared/sysdep-ppc/sigcontext.h → arch/um/sys-ppc/sysdep/sigcontext.h


+ 0 - 0
arch/um/include/shared/sysdep-ppc/skas_ptrace.h → arch/um/sys-ppc/sysdep/skas_ptrace.h


+ 0 - 0
arch/um/include/shared/sysdep-ppc/syscalls.h → arch/um/sys-ppc/sysdep/syscalls.h


+ 0 - 0
arch/um/include/shared/sysdep-x86_64/archsetjmp.h → arch/um/sys-x86_64/sysdep/archsetjmp.h


+ 0 - 0
arch/um/include/shared/sysdep-x86_64/barrier.h → arch/um/sys-x86_64/sysdep/barrier.h


+ 0 - 0
arch/um/include/shared/sysdep-x86_64/checksum.h → arch/um/sys-x86_64/sysdep/checksum.h


+ 0 - 0
arch/um/include/shared/sysdep-x86_64/faultinfo.h → arch/um/sys-x86_64/sysdep/faultinfo.h


+ 0 - 0
arch/um/include/shared/sysdep-x86_64/host_ldt.h → arch/um/sys-x86_64/sysdep/host_ldt.h


+ 0 - 0
arch/um/include/shared/sysdep-x86_64/kernel-offsets.h → arch/um/sys-x86_64/sysdep/kernel-offsets.h


+ 0 - 0
arch/um/include/shared/sysdep-x86_64/ptrace.h → arch/um/sys-x86_64/sysdep/ptrace.h


+ 0 - 0
arch/um/include/shared/sysdep-x86_64/ptrace_user.h → arch/um/sys-x86_64/sysdep/ptrace_user.h


+ 0 - 0
arch/um/include/shared/sysdep-x86_64/sc.h → arch/um/sys-x86_64/sysdep/sc.h


+ 0 - 0
arch/um/include/shared/sysdep-x86_64/sigcontext.h → arch/um/sys-x86_64/sysdep/sigcontext.h


+ 0 - 0
arch/um/include/shared/sysdep-x86_64/skas_ptrace.h → arch/um/sys-x86_64/sysdep/skas_ptrace.h


+ 0 - 0
arch/um/include/shared/sysdep-x86_64/stub.h → arch/um/sys-x86_64/sysdep/stub.h


+ 0 - 0
arch/um/include/shared/sysdep-x86_64/syscalls.h → arch/um/sys-x86_64/sysdep/syscalls.h


+ 0 - 0
arch/um/include/shared/sysdep-x86_64/system.h → arch/um/sys-x86_64/sysdep/system.h


+ 0 - 0
arch/um/include/shared/sysdep-x86_64/tls.h → arch/um/sys-x86_64/sysdep/tls.h


+ 0 - 0
arch/um/include/shared/sysdep-x86_64/vm-flags.h → arch/um/sys-x86_64/sysdep/vm-flags.h