50 files changed, 5 insertions, 19 deletions
diff --git a/arch/um/Makefile b/arch/um/Makefile
index bc070cef3ceb..2606bdaefcb6 100644
--- a/arch/um/Makefile
+++ b/arch/um/Makefile
@@ -18,28 +18,23 @@ core-y			+= $(ARCH_DIR)/kernel/		\
                           $(ARCH_DIR)/drivers/         \
                           $(ARCH_DIR)/os-$(OS)/
-# Have to precede the include because the included Makefiles reference them.
-SYMLINK_HEADERS := archparam.h processor.h ptrace.h module.h elf.h
-SYMLINK_HEADERS := $(foreach header,$(SYMLINK_HEADERS),$(ARCH_DIR)/include/asm/$(header))
 # XXX: The "os" symlink is only used by arch/um/include/os.h, which includes
 # ../os/include/file.h
 #
 # These are cleaned up during mrproper. Please DO NOT fix it again, this is
 # the Correct Thing(tm) to do!
-ARCH_SYMLINKS = $(ARCH_DIR)/os \
+ARCH_SYMLINKS = $(ARCH_DIR)/os $(ARCH_DIR)/include/shared/uml-config.h
-        $(SYMLINK_HEADERS) $(ARCH_DIR)/include/shared/uml-config.h
 MODE_INCLUDE    += -I$(srctree)/$(ARCH_DIR)/include/shared/skas
 include $(srctree)/$(ARCH_DIR)/Makefile-skas
-ARCH_INCLUDE    := -I$(ARCH_DIR)/include/shared
+ARCH_INCLUDE    := -I$(srctree)/$(ARCH_DIR)/include/shared
+ARCH_INCLUDE    += -I$(srctree)/$(ARCH_DIR)/sys-$(SUBARCH)/shared
 ifneq ($(KBUILD_SRC),)
-ARCH_INCLUDE    += -I$(srctree)/$(ARCH_DIR)/include/shared
+ARCH_INCLUDE    += -I$(ARCH_DIR)/include/shared # for three generated files
-KBUILD_CPPFLAGS += -I$(ARCH_DIR)/include # for SYMLINK_HEADERS
 endif
-ARCH_INCLUDE    += -I$(srctree)/$(ARCH_DIR)/sys-$(SUBARCH) # for sysdep
+KBUILD_CPPFLAGS += -I$(srctree)/$(ARCH_DIR)/sys-$(SUBARCH)
 # -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.
@@ -144,15 +139,6 @@ archclean:
        @find . \( -name '*.bb' -o -name '*.bbg' -o -name '*.da' \
                -o -name '*.gcov' \) -type f -print | xargs rm -f
-$(SYMLINK_HEADERS):
-        @echo '  SYMLINK $@'
-ifneq ($(KBUILD_SRC),)
-        $(Q)mkdir -p $(objtree)/$(ARCH_DIR)/include/asm
-        $(Q)ln -fsn $(srctree)/$(ARCH_DIR)/include/asm/$(basename $(notdir $@))-$(SUBARCH)$(suffix $@) $@
-else
-        $(Q)ln -sf $(basename $(notdir $@))-$(SUBARCH)$(suffix $@) $@
-endif
 $(objtree)/$(ARCH_DIR)/include/shared:
        @echo '  MKDIR $@'
        $(Q)mkdir -p $@
diff --git a/arch/um/include/asm/archparam-i386.h b/arch/um/sys-i386/asm/archparam.h
index 93fd723344e5..93fd723344e5 100644
--- a/arch/um/include/asm/archparam-i386.h
+++ b/arch/um/sys-i386/asm/archparam.h
diff --git a/arch/um/include/asm/elf-i386.h b/arch/um/sys-i386/asm/elf.h
index d0da9d7c5371..d0da9d7c5371 100644
--- a/arch/um/include/asm/elf-i386.h
+++ b/arch/um/sys-i386/asm/elf.h
diff --git a/arch/um/include/asm/module-i386.h b/arch/um/sys-i386/asm/module.h
index 5ead4a0b2e35..5ead4a0b2e35 100644
--- a/arch/um/include/asm/module-i386.h
+++ b/arch/um/sys-i386/asm/module.h
diff --git a/arch/um/include/asm/processor-i386.h b/arch/um/sys-i386/asm/processor.h
index 82a9061ab5be..82a9061ab5be 100644
--- a/arch/um/include/asm/processor-i386.h
+++ b/arch/um/sys-i386/asm/processor.h
diff --git a/arch/um/include/asm/ptrace-i386.h b/arch/um/sys-i386/asm/ptrace.h
index 0273e4d09af7..0273e4d09af7 100644
--- a/arch/um/include/asm/ptrace-i386.h
+++ b/arch/um/sys-i386/asm/ptrace.h
diff --git a/arch/um/sys-i386/sysdep/archsetjmp.h b/arch/um/sys-i386/shared/sysdep/archsetjmp.h
index 0f312085ce1d..0f312085ce1d 100644
--- a/arch/um/sys-i386/sysdep/archsetjmp.h
+++ b/arch/um/sys-i386/shared/sysdep/archsetjmp.h
diff --git a/arch/um/sys-i386/sysdep/barrier.h b/arch/um/sys-i386/shared/sysdep/barrier.h
index b58d52c5b2f4..b58d52c5b2f4 100644
--- a/arch/um/sys-i386/sysdep/barrier.h
+++ b/arch/um/sys-i386/shared/sysdep/barrier.h
diff --git a/arch/um/sys-i386/sysdep/checksum.h b/arch/um/sys-i386/shared/sysdep/checksum.h
index 0cb4645cbeb8..0cb4645cbeb8 100644
--- a/arch/um/sys-i386/sysdep/checksum.h
+++ b/arch/um/sys-i386/shared/sysdep/checksum.h
diff --git a/arch/um/sys-i386/sysdep/faultinfo.h b/arch/um/sys-i386/shared/sysdep/faultinfo.h
index db437cc373bc..db437cc373bc 100644
--- a/arch/um/sys-i386/sysdep/faultinfo.h
+++ b/arch/um/sys-i386/shared/sysdep/faultinfo.h
diff --git a/arch/um/sys-i386/sysdep/host_ldt.h b/arch/um/sys-i386/shared/sysdep/host_ldt.h
index 0953cc4df652..0953cc4df652 100644
--- a/arch/um/sys-i386/sysdep/host_ldt.h
+++ b/arch/um/sys-i386/shared/sysdep/host_ldt.h
diff --git a/arch/um/sys-i386/sysdep/kernel-offsets.h b/arch/um/sys-i386/shared/sysdep/kernel-offsets.h
index 5868526b5eef..5868526b5eef 100644
--- a/arch/um/sys-i386/sysdep/kernel-offsets.h
+++ b/arch/um/sys-i386/shared/sysdep/kernel-offsets.h
diff --git a/arch/um/sys-i386/sysdep/ptrace.h b/arch/um/sys-i386/shared/sysdep/ptrace.h
index 11c08969d134..11c08969d134 100644
--- a/arch/um/sys-i386/sysdep/ptrace.h
+++ b/arch/um/sys-i386/shared/sysdep/ptrace.h
diff --git a/arch/um/sys-i386/sysdep/ptrace_user.h b/arch/um/sys-i386/shared/sysdep/ptrace_user.h
index ef56247e4143..ef56247e4143 100644
--- a/arch/um/sys-i386/sysdep/ptrace_user.h
+++ b/arch/um/sys-i386/shared/sysdep/ptrace_user.h
diff --git a/arch/um/sys-i386/sysdep/sc.h b/arch/um/sys-i386/shared/sysdep/sc.h
index c57d1780ad37..c57d1780ad37 100644
--- a/arch/um/sys-i386/sysdep/sc.h
+++ b/arch/um/sys-i386/shared/sysdep/sc.h
diff --git a/arch/um/sys-i386/sysdep/sigcontext.h b/arch/um/sys-i386/shared/sysdep/sigcontext.h
index f583c87111a0..f583c87111a0 100644
--- a/arch/um/sys-i386/sysdep/sigcontext.h
+++ b/arch/um/sys-i386/shared/sysdep/sigcontext.h
diff --git a/arch/um/sys-i386/sysdep/skas_ptrace.h b/arch/um/sys-i386/shared/sysdep/skas_ptrace.h
index e27b8a791773..e27b8a791773 100644
--- a/arch/um/sys-i386/sysdep/skas_ptrace.h
+++ b/arch/um/sys-i386/shared/sysdep/skas_ptrace.h
diff --git a/arch/um/sys-i386/sysdep/stub.h b/arch/um/sys-i386/shared/sysdep/stub.h
index 8c097b87fca7..8c097b87fca7 100644
--- a/arch/um/sys-i386/sysdep/stub.h
+++ b/arch/um/sys-i386/shared/sysdep/stub.h
diff --git a/arch/um/sys-i386/sysdep/syscalls.h b/arch/um/sys-i386/shared/sysdep/syscalls.h
index 905698197e35..905698197e35 100644
--- a/arch/um/sys-i386/sysdep/syscalls.h
+++ b/arch/um/sys-i386/shared/sysdep/syscalls.h
diff --git a/arch/um/sys-i386/sysdep/system.h b/arch/um/sys-i386/shared/sysdep/system.h
index d1b93c436200..d1b93c436200 100644
--- a/arch/um/sys-i386/sysdep/system.h
+++ b/arch/um/sys-i386/shared/sysdep/system.h
diff --git a/arch/um/sys-i386/sysdep/tls.h b/arch/um/sys-i386/shared/sysdep/tls.h
index 34550755b2a1..34550755b2a1 100644
--- a/arch/um/sys-i386/sysdep/tls.h
+++ b/arch/um/sys-i386/shared/sysdep/tls.h
diff --git a/arch/um/sys-i386/sysdep/vm-flags.h b/arch/um/sys-i386/shared/sysdep/vm-flags.h
index e0d24c568dbc..e0d24c568dbc 100644
--- a/arch/um/sys-i386/sysdep/vm-flags.h
+++ b/arch/um/sys-i386/shared/sysdep/vm-flags.h
diff --git a/arch/um/include/asm/archparam-ppc.h b/arch/um/sys-ppc/asm/archparam.h
index 4269d8a37b4f..4269d8a37b4f 100644
--- a/arch/um/include/asm/archparam-ppc.h
+++ b/arch/um/sys-ppc/asm/archparam.h
diff --git a/arch/um/include/asm/elf-ppc.h b/arch/um/sys-ppc/asm/elf.h
index af9463cd8ce5..af9463cd8ce5 100644
--- a/arch/um/include/asm/elf-ppc.h
+++ b/arch/um/sys-ppc/asm/elf.h
diff --git a/arch/um/include/asm/processor-ppc.h b/arch/um/sys-ppc/asm/processor.h
index 959323151229..959323151229 100644
--- a/arch/um/include/asm/processor-ppc.h
+++ b/arch/um/sys-ppc/asm/processor.h
diff --git a/arch/um/sys-ppc/sysdep/ptrace.h b/arch/um/sys-ppc/shared/sysdep/ptrace.h
index df2397dba3e5..df2397dba3e5 100644
--- a/arch/um/sys-ppc/sysdep/ptrace.h
+++ b/arch/um/sys-ppc/shared/sysdep/ptrace.h
diff --git a/arch/um/sys-ppc/sysdep/sigcontext.h b/arch/um/sys-ppc/shared/sysdep/sigcontext.h
index f20d965de9c7..f20d965de9c7 100644
--- a/arch/um/sys-ppc/sysdep/sigcontext.h
+++ b/arch/um/sys-ppc/shared/sysdep/sigcontext.h
diff --git a/arch/um/sys-ppc/sysdep/skas_ptrace.h b/arch/um/sys-ppc/shared/sysdep/skas_ptrace.h
index d9fbbac10de0..d9fbbac10de0 100644
--- a/arch/um/sys-ppc/sysdep/skas_ptrace.h
+++ b/arch/um/sys-ppc/shared/sysdep/skas_ptrace.h
diff --git a/arch/um/sys-ppc/sysdep/syscalls.h b/arch/um/sys-ppc/shared/sysdep/syscalls.h
index 679df351e19b..679df351e19b 100644
--- a/arch/um/sys-ppc/sysdep/syscalls.h
+++ b/arch/um/sys-ppc/shared/sysdep/syscalls.h
diff --git a/arch/um/include/asm/archparam-x86_64.h b/arch/um/sys-x86_64/asm/archparam.h
index 270ed9586b68..270ed9586b68 100644
--- a/arch/um/include/asm/archparam-x86_64.h
+++ b/arch/um/sys-x86_64/asm/archparam.h
diff --git a/arch/um/include/asm/elf-x86_64.h b/arch/um/sys-x86_64/asm/elf.h
index 6e8a9195e952..6e8a9195e952 100644
--- a/arch/um/include/asm/elf-x86_64.h
+++ b/arch/um/sys-x86_64/asm/elf.h
diff --git a/arch/um/include/asm/module-x86_64.h b/arch/um/sys-x86_64/asm/module.h
index 35b5491d3e96..35b5491d3e96 100644
--- a/arch/um/include/asm/module-x86_64.h
+++ b/arch/um/sys-x86_64/asm/module.h
diff --git a/arch/um/include/asm/processor-x86_64.h b/arch/um/sys-x86_64/asm/processor.h
index 875a26a62614..875a26a62614 100644
--- a/arch/um/include/asm/processor-x86_64.h
+++ b/arch/um/sys-x86_64/asm/processor.h
diff --git a/arch/um/include/asm/ptrace-x86_64.h b/arch/um/sys-x86_64/asm/ptrace.h
index 83d8c473b905..83d8c473b905 100644
--- a/arch/um/include/asm/ptrace-x86_64.h
+++ b/arch/um/sys-x86_64/asm/ptrace.h
diff --git a/arch/um/sys-x86_64/sysdep/archsetjmp.h b/arch/um/sys-x86_64/shared/sysdep/archsetjmp.h
index 2af8f12ca161..2af8f12ca161 100644
--- a/arch/um/sys-x86_64/sysdep/archsetjmp.h
+++ b/arch/um/sys-x86_64/shared/sysdep/archsetjmp.h
diff --git a/arch/um/sys-x86_64/sysdep/barrier.h b/arch/um/sys-x86_64/shared/sysdep/barrier.h
index 7b610befdc8f..7b610befdc8f 100644
--- a/arch/um/sys-x86_64/sysdep/barrier.h
+++ b/arch/um/sys-x86_64/shared/sysdep/barrier.h
diff --git a/arch/um/sys-x86_64/sysdep/checksum.h b/arch/um/sys-x86_64/shared/sysdep/checksum.h
index a5be9031ea85..a5be9031ea85 100644
--- a/arch/um/sys-x86_64/sysdep/checksum.h
+++ b/arch/um/sys-x86_64/shared/sysdep/checksum.h
diff --git a/arch/um/sys-x86_64/sysdep/faultinfo.h b/arch/um/sys-x86_64/shared/sysdep/faultinfo.h
index cb917b0d5660..cb917b0d5660 100644
--- a/arch/um/sys-x86_64/sysdep/faultinfo.h
+++ b/arch/um/sys-x86_64/shared/sysdep/faultinfo.h
diff --git a/arch/um/sys-x86_64/sysdep/host_ldt.h b/arch/um/sys-x86_64/shared/sysdep/host_ldt.h
index e8b1be1e154f..e8b1be1e154f 100644
--- a/arch/um/sys-x86_64/sysdep/host_ldt.h
+++ b/arch/um/sys-x86_64/shared/sysdep/host_ldt.h
diff --git a/arch/um/sys-x86_64/sysdep/kernel-offsets.h b/arch/um/sys-x86_64/shared/sysdep/kernel-offsets.h
index a307237b7964..a307237b7964 100644
--- a/arch/um/sys-x86_64/sysdep/kernel-offsets.h
+++ b/arch/um/sys-x86_64/shared/sysdep/kernel-offsets.h
diff --git a/arch/um/sys-x86_64/sysdep/ptrace.h b/arch/um/sys-x86_64/shared/sysdep/ptrace.h
index 9ea44d111f33..9ea44d111f33 100644
--- a/arch/um/sys-x86_64/sysdep/ptrace.h
+++ b/arch/um/sys-x86_64/shared/sysdep/ptrace.h
diff --git a/arch/um/sys-x86_64/sysdep/ptrace_user.h b/arch/um/sys-x86_64/shared/sysdep/ptrace_user.h
index 4dbccdb58f48..4dbccdb58f48 100644
--- a/arch/um/sys-x86_64/sysdep/ptrace_user.h
+++ b/arch/um/sys-x86_64/shared/sysdep/ptrace_user.h
diff --git a/arch/um/sys-x86_64/sysdep/sc.h b/arch/um/sys-x86_64/shared/sysdep/sc.h
index 8aee45b07434..8aee45b07434 100644
--- a/arch/um/sys-x86_64/sysdep/sc.h
+++ b/arch/um/sys-x86_64/shared/sysdep/sc.h
diff --git a/arch/um/sys-x86_64/sysdep/sigcontext.h b/arch/um/sys-x86_64/shared/sysdep/sigcontext.h
index 0155133b1458..0155133b1458 100644
--- a/arch/um/sys-x86_64/sysdep/sigcontext.h
+++ b/arch/um/sys-x86_64/shared/sysdep/sigcontext.h
diff --git a/arch/um/sys-x86_64/sysdep/skas_ptrace.h b/arch/um/sys-x86_64/shared/sysdep/skas_ptrace.h
index 95db4be786e4..95db4be786e4 100644
--- a/arch/um/sys-x86_64/sysdep/skas_ptrace.h
+++ b/arch/um/sys-x86_64/shared/sysdep/skas_ptrace.h
diff --git a/arch/um/sys-x86_64/sysdep/stub.h b/arch/um/sys-x86_64/shared/sysdep/stub.h
index 655f9c2de3ac..655f9c2de3ac 100644
--- a/arch/um/sys-x86_64/sysdep/stub.h
+++ b/arch/um/sys-x86_64/shared/sysdep/stub.h
diff --git a/arch/um/sys-x86_64/sysdep/syscalls.h b/arch/um/sys-x86_64/shared/sysdep/syscalls.h
index 7cfb0b085655..7cfb0b085655 100644
--- a/arch/um/sys-x86_64/sysdep/syscalls.h
+++ b/arch/um/sys-x86_64/shared/sysdep/syscalls.h
diff --git a/arch/um/sys-x86_64/sysdep/system.h b/arch/um/sys-x86_64/shared/sysdep/system.h
index d1b93c436200..d1b93c436200 100644
--- a/arch/um/sys-x86_64/sysdep/system.h
+++ b/arch/um/sys-x86_64/shared/sysdep/system.h
diff --git a/arch/um/sys-x86_64/sysdep/tls.h b/arch/um/sys-x86_64/shared/sysdep/tls.h
index 18c000d0357a..18c000d0357a 100644
--- a/arch/um/sys-x86_64/sysdep/tls.h
+++ b/arch/um/sys-x86_64/shared/sysdep/tls.h
diff --git a/arch/um/sys-x86_64/sysdep/vm-flags.h b/arch/um/sys-x86_64/shared/sysdep/vm-flags.h
index 3213edfa7888..3213edfa7888 100644
--- a/arch/um/sys-x86_64/sysdep/vm-flags.h
+++ b/arch/um/sys-x86_64/shared/sysdep/vm-flags.h