summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/um/Makefile12
-rw-r--r--arch/um/sys-i386/sysdep/archsetjmp.h (renamed from arch/um/include/shared/sysdep-i386/archsetjmp.h)0
-rw-r--r--arch/um/sys-i386/sysdep/barrier.h (renamed from arch/um/include/shared/sysdep-i386/barrier.h)0
-rw-r--r--arch/um/sys-i386/sysdep/checksum.h (renamed from arch/um/include/shared/sysdep-i386/checksum.h)0
-rw-r--r--arch/um/sys-i386/sysdep/faultinfo.h (renamed from arch/um/include/shared/sysdep-i386/faultinfo.h)0
-rw-r--r--arch/um/sys-i386/sysdep/host_ldt.h (renamed from arch/um/include/shared/sysdep-i386/host_ldt.h)0
-rw-r--r--arch/um/sys-i386/sysdep/kernel-offsets.h (renamed from arch/um/include/shared/sysdep-i386/kernel-offsets.h)0
-rw-r--r--arch/um/sys-i386/sysdep/ptrace.h (renamed from arch/um/include/shared/sysdep-i386/ptrace.h)0
-rw-r--r--arch/um/sys-i386/sysdep/ptrace_user.h (renamed from arch/um/include/shared/sysdep-i386/ptrace_user.h)0
-rw-r--r--arch/um/sys-i386/sysdep/sc.h (renamed from arch/um/include/shared/sysdep-i386/sc.h)0
-rw-r--r--arch/um/sys-i386/sysdep/sigcontext.h (renamed from arch/um/include/shared/sysdep-i386/sigcontext.h)0
-rw-r--r--arch/um/sys-i386/sysdep/skas_ptrace.h (renamed from arch/um/include/shared/sysdep-i386/skas_ptrace.h)0
-rw-r--r--arch/um/sys-i386/sysdep/stub.h (renamed from arch/um/include/shared/sysdep-i386/stub.h)0
-rw-r--r--arch/um/sys-i386/sysdep/syscalls.h (renamed from arch/um/include/shared/sysdep-i386/syscalls.h)0
-rw-r--r--arch/um/sys-i386/sysdep/system.h (renamed from arch/um/include/shared/sysdep-i386/system.h)0
-rw-r--r--arch/um/sys-i386/sysdep/tls.h (renamed from arch/um/include/shared/sysdep-i386/tls.h)0
-rw-r--r--arch/um/sys-i386/sysdep/vm-flags.h (renamed from arch/um/include/shared/sysdep-i386/vm-flags.h)0
-rw-r--r--arch/um/sys-ia64/sysdep/ptrace.h (renamed from arch/um/include/shared/sysdep-ia64/ptrace.h)0
-rw-r--r--arch/um/sys-ia64/sysdep/sigcontext.h (renamed from arch/um/include/shared/sysdep-ia64/sigcontext.h)0
-rw-r--r--arch/um/sys-ia64/sysdep/skas_ptrace.h (renamed from arch/um/include/shared/sysdep-ia64/skas_ptrace.h)0
-rw-r--r--arch/um/sys-ia64/sysdep/syscalls.h (renamed from arch/um/include/shared/sysdep-ia64/syscalls.h)0
-rw-r--r--arch/um/sys-ppc/sysdep/ptrace.h (renamed from arch/um/include/shared/sysdep-ppc/ptrace.h)0
-rw-r--r--arch/um/sys-ppc/sysdep/sigcontext.h (renamed from arch/um/include/shared/sysdep-ppc/sigcontext.h)0
-rw-r--r--arch/um/sys-ppc/sysdep/skas_ptrace.h (renamed from arch/um/include/shared/sysdep-ppc/skas_ptrace.h)0
-rw-r--r--arch/um/sys-ppc/sysdep/syscalls.h (renamed from arch/um/include/shared/sysdep-ppc/syscalls.h)0
-rw-r--r--arch/um/sys-x86_64/sysdep/archsetjmp.h (renamed from arch/um/include/shared/sysdep-x86_64/archsetjmp.h)0
-rw-r--r--arch/um/sys-x86_64/sysdep/barrier.h (renamed from arch/um/include/shared/sysdep-x86_64/barrier.h)0
-rw-r--r--arch/um/sys-x86_64/sysdep/checksum.h (renamed from arch/um/include/shared/sysdep-x86_64/checksum.h)0
-rw-r--r--arch/um/sys-x86_64/sysdep/faultinfo.h (renamed from arch/um/include/shared/sysdep-x86_64/faultinfo.h)0
-rw-r--r--arch/um/sys-x86_64/sysdep/host_ldt.h (renamed from arch/um/include/shared/sysdep-x86_64/host_ldt.h)0
-rw-r--r--arch/um/sys-x86_64/sysdep/kernel-offsets.h (renamed from arch/um/include/shared/sysdep-x86_64/kernel-offsets.h)0
-rw-r--r--arch/um/sys-x86_64/sysdep/ptrace.h (renamed from arch/um/include/shared/sysdep-x86_64/ptrace.h)0
-rw-r--r--arch/um/sys-x86_64/sysdep/ptrace_user.h (renamed from arch/um/include/shared/sysdep-x86_64/ptrace_user.h)0
-rw-r--r--arch/um/sys-x86_64/sysdep/sc.h (renamed from arch/um/include/shared/sysdep-x86_64/sc.h)0
-rw-r--r--arch/um/sys-x86_64/sysdep/sigcontext.h (renamed from arch/um/include/shared/sysdep-x86_64/sigcontext.h)0
-rw-r--r--arch/um/sys-x86_64/sysdep/skas_ptrace.h (renamed from arch/um/include/shared/sysdep-x86_64/skas_ptrace.h)0
-rw-r--r--arch/um/sys-x86_64/sysdep/stub.h (renamed from arch/um/include/shared/sysdep-x86_64/stub.h)0
-rw-r--r--arch/um/sys-x86_64/sysdep/syscalls.h (renamed from arch/um/include/shared/sysdep-x86_64/syscalls.h)0
-rw-r--r--arch/um/sys-x86_64/sysdep/system.h (renamed from arch/um/include/shared/sysdep-x86_64/system.h)0
-rw-r--r--arch/um/sys-x86_64/sysdep/tls.h (renamed from arch/um/include/shared/sysdep-x86_64/tls.h)0
-rw-r--r--arch/um/sys-x86_64/sysdep/vm-flags.h (renamed from arch/um/include/shared/sysdep-x86_64/vm-flags.h)0
41 files changed, 2 insertions, 10 deletions
diff --git a/arch/um/Makefile b/arch/um/Makefile
index 3af8c81bf4f..2e042b0e3b8 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 0f312085ce1..0f312085ce1 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 b58d52c5b2f..b58d52c5b2f 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 0cb4645cbeb..0cb4645cbeb 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 db437cc373b..db437cc373b 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 0953cc4df65..0953cc4df65 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 5868526b5ee..5868526b5ee 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 11c08969d13..11c08969d13 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 ef56247e414..ef56247e414 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 c57d1780ad3..c57d1780ad3 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 f583c87111a..f583c87111a 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 e27b8a79177..e27b8a79177 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 8c097b87fca..8c097b87fca 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 905698197e3..905698197e3 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-i386/system.h b/arch/um/sys-i386/sysdep/system.h
index d1b93c43620..d1b93c43620 100644
--- a/arch/um/include/shared/sysdep-i386/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 34550755b2a..34550755b2a 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 e0d24c568db..e0d24c568db 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 42dd8fb6f2f..42dd8fb6f2f 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 f15fb25260b..f15fb25260b 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 25a38e71570..25a38e71570 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 4a1f46ef1eb..4a1f46ef1eb 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 df2397dba3e..df2397dba3e 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 f20d965de9c..f20d965de9c 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 d9fbbac10de..d9fbbac10de 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 679df351e19..679df351e19 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 2af8f12ca16..2af8f12ca16 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 7b610befdc8..7b610befdc8 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 a5be9031ea8..a5be9031ea8 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 cb917b0d566..cb917b0d566 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 e8b1be1e154..e8b1be1e154 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 a307237b796..a307237b796 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 9ea44d111f3..9ea44d111f3 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 4dbccdb58f4..4dbccdb58f4 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 8aee45b0743..8aee45b0743 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 0155133b145..0155133b145 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 95db4be786e..95db4be786e 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 655f9c2de3a..655f9c2de3a 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 7cfb0b08565..7cfb0b08565 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-x86_64/system.h b/arch/um/sys-x86_64/sysdep/system.h
index d1b93c43620..d1b93c43620 100644
--- a/arch/um/include/shared/sysdep-x86_64/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 18c000d0357..18c000d0357 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 3213edfa788..3213edfa788 100644
--- a/arch/um/include/shared/sysdep-x86_64/vm-flags.h
+++ b/arch/um/sys-x86_64/sysdep/vm-flags.h