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>

diff --git a/arch/um/Makefile b/arch/um/Makefile
index 3af8c81..2e042b0 100644 (file)
--- 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
similarity index 100%
rename from arch/um/include/shared/sysdep-i386/archsetjmp.h
rename to 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
similarity index 100%
rename from arch/um/include/shared/sysdep-i386/barrier.h
rename to 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
similarity index 100%
rename from arch/um/include/shared/sysdep-i386/checksum.h
rename to 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
similarity index 100%
rename from arch/um/include/shared/sysdep-i386/faultinfo.h
rename to 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
similarity index 100%
rename from arch/um/include/shared/sysdep-i386/host_ldt.h
rename to 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
similarity index 100%
rename from arch/um/include/shared/sysdep-i386/kernel-offsets.h
rename to 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
similarity index 100%
rename from arch/um/include/shared/sysdep-i386/ptrace.h
rename to 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
similarity index 100%
rename from arch/um/include/shared/sysdep-i386/ptrace_user.h
rename to 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
similarity index 100%
rename from arch/um/include/shared/sysdep-i386/sc.h
rename to 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
similarity index 100%
rename from arch/um/include/shared/sysdep-i386/sigcontext.h
rename to 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
similarity index 100%
rename from arch/um/include/shared/sysdep-i386/skas_ptrace.h
rename to 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
similarity index 100%
rename from arch/um/include/shared/sysdep-i386/stub.h
rename to 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
similarity index 100%
rename from arch/um/include/shared/sysdep-i386/syscalls.h
rename to 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
similarity index 100%
rename from arch/um/include/shared/sysdep-x86_64/system.h
rename to 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
similarity index 100%
rename from arch/um/include/shared/sysdep-i386/tls.h
rename to 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
similarity index 100%
rename from arch/um/include/shared/sysdep-i386/vm-flags.h
rename to 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
similarity index 100%
rename from arch/um/include/shared/sysdep-ia64/ptrace.h
rename to 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
similarity index 100%
rename from arch/um/include/shared/sysdep-ia64/sigcontext.h
rename to 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
similarity index 100%
rename from arch/um/include/shared/sysdep-ia64/skas_ptrace.h
rename to 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
similarity index 100%
rename from arch/um/include/shared/sysdep-ia64/syscalls.h
rename to 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
similarity index 100%
rename from arch/um/include/shared/sysdep-ppc/ptrace.h
rename to 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
similarity index 100%
rename from arch/um/include/shared/sysdep-ppc/sigcontext.h
rename to 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
similarity index 100%
rename from arch/um/include/shared/sysdep-ppc/skas_ptrace.h
rename to 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
similarity index 100%
rename from arch/um/include/shared/sysdep-ppc/syscalls.h
rename to 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
similarity index 100%
rename from arch/um/include/shared/sysdep-x86_64/archsetjmp.h
rename to 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
similarity index 100%
rename from arch/um/include/shared/sysdep-x86_64/barrier.h
rename to 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
similarity index 100%
rename from arch/um/include/shared/sysdep-x86_64/checksum.h
rename to 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
similarity index 100%
rename from arch/um/include/shared/sysdep-x86_64/faultinfo.h
rename to 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
similarity index 100%
rename from arch/um/include/shared/sysdep-x86_64/host_ldt.h
rename to 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
similarity index 100%
rename from arch/um/include/shared/sysdep-x86_64/kernel-offsets.h
rename to 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
similarity index 100%
rename from arch/um/include/shared/sysdep-x86_64/ptrace.h
rename to 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
similarity index 100%
rename from arch/um/include/shared/sysdep-x86_64/ptrace_user.h
rename to 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
similarity index 100%
rename from arch/um/include/shared/sysdep-x86_64/sc.h
rename to 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
similarity index 100%
rename from arch/um/include/shared/sysdep-x86_64/sigcontext.h
rename to 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
similarity index 100%
rename from arch/um/include/shared/sysdep-x86_64/skas_ptrace.h
rename to 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
similarity index 100%
rename from arch/um/include/shared/sysdep-x86_64/stub.h
rename to 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
similarity index 100%
rename from arch/um/include/shared/sysdep-x86_64/syscalls.h
rename to 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
similarity index 100%
rename from arch/um/include/shared/sysdep-i386/system.h
rename to 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
similarity index 100%
rename from arch/um/include/shared/sysdep-x86_64/tls.h
rename to 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
similarity index 100%
rename from arch/um/include/shared/sysdep-x86_64/vm-flags.h
rename to arch/um/sys-x86_64/sysdep/vm-flags.h