From: Al Viro Date: Sat, 23 Aug 2008 21:28:20 +0000 (-0400) Subject: x86, um: get rid of header symlinks X-Git-Tag: v2.6.28-rc1~25^2~7 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=aa7bd942498512d6b77d1d0da846a8ecdd5d6186;p=linux-2.6-omap-h63xx.git x86, um: get rid of header symlinks Signed-off-by: Al Viro Signed-off-by: H. Peter Anvin --- diff --git a/arch/um/Makefile b/arch/um/Makefile index bc070cef3ce..2606bdaefcb 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 \ - $(SYMLINK_HEADERS) $(ARCH_DIR)/include/shared/uml-config.h +ARCH_SYMLINKS = $(ARCH_DIR)/os $(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 -KBUILD_CPPFLAGS += -I$(ARCH_DIR)/include # for SYMLINK_HEADERS +ARCH_INCLUDE += -I$(ARCH_DIR)/include/shared # for three generated files 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 similarity index 100% rename from arch/um/include/asm/archparam-i386.h rename to 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 similarity index 100% rename from arch/um/include/asm/elf-i386.h rename to 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 similarity index 100% rename from arch/um/include/asm/module-i386.h rename to 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 similarity index 100% rename from arch/um/include/asm/processor-i386.h rename to 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 similarity index 100% rename from arch/um/include/asm/ptrace-i386.h rename to 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 similarity index 100% rename from arch/um/sys-i386/sysdep/archsetjmp.h rename to 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 similarity index 100% rename from arch/um/sys-i386/sysdep/barrier.h rename to 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 similarity index 100% rename from arch/um/sys-i386/sysdep/checksum.h rename to 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 similarity index 100% rename from arch/um/sys-i386/sysdep/faultinfo.h rename to 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 similarity index 100% rename from arch/um/sys-i386/sysdep/host_ldt.h rename to 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 similarity index 100% rename from arch/um/sys-i386/sysdep/kernel-offsets.h rename to 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 similarity index 100% rename from arch/um/sys-i386/sysdep/ptrace.h rename to 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 similarity index 100% rename from arch/um/sys-i386/sysdep/ptrace_user.h rename to 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 similarity index 100% rename from arch/um/sys-i386/sysdep/sc.h rename to 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 similarity index 100% rename from arch/um/sys-i386/sysdep/sigcontext.h rename to 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 similarity index 100% rename from arch/um/sys-i386/sysdep/skas_ptrace.h rename to 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 similarity index 100% rename from arch/um/sys-i386/sysdep/stub.h rename to 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 similarity index 100% rename from arch/um/sys-i386/sysdep/syscalls.h rename to 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 similarity index 100% rename from arch/um/sys-i386/sysdep/system.h rename to 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 similarity index 100% rename from arch/um/sys-i386/sysdep/tls.h rename to 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 similarity index 100% rename from arch/um/sys-i386/sysdep/vm-flags.h rename to 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 similarity index 100% rename from arch/um/include/asm/archparam-ppc.h rename to 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 similarity index 100% rename from arch/um/include/asm/elf-ppc.h rename to 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 similarity index 100% rename from arch/um/include/asm/processor-ppc.h rename to 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 similarity index 100% rename from arch/um/sys-ppc/sysdep/ptrace.h rename to 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 similarity index 100% rename from arch/um/sys-ppc/sysdep/sigcontext.h rename to 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 similarity index 100% rename from arch/um/sys-ppc/sysdep/skas_ptrace.h rename to 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 similarity index 100% rename from arch/um/sys-ppc/sysdep/syscalls.h rename to 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 similarity index 100% rename from arch/um/include/asm/archparam-x86_64.h rename to 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 similarity index 100% rename from arch/um/include/asm/elf-x86_64.h rename to 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 similarity index 100% rename from arch/um/include/asm/module-x86_64.h rename to 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 similarity index 100% rename from arch/um/include/asm/processor-x86_64.h rename to 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 similarity index 100% rename from arch/um/include/asm/ptrace-x86_64.h rename to 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 similarity index 100% rename from arch/um/sys-x86_64/sysdep/archsetjmp.h rename to 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 similarity index 100% rename from arch/um/sys-x86_64/sysdep/barrier.h rename to 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 similarity index 100% rename from arch/um/sys-x86_64/sysdep/checksum.h rename to 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 similarity index 100% rename from arch/um/sys-x86_64/sysdep/faultinfo.h rename to 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 similarity index 100% rename from arch/um/sys-x86_64/sysdep/host_ldt.h rename to 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 similarity index 100% rename from arch/um/sys-x86_64/sysdep/kernel-offsets.h rename to 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 similarity index 100% rename from arch/um/sys-x86_64/sysdep/ptrace.h rename to 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 similarity index 100% rename from arch/um/sys-x86_64/sysdep/ptrace_user.h rename to 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 similarity index 100% rename from arch/um/sys-x86_64/sysdep/sc.h rename to 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 similarity index 100% rename from arch/um/sys-x86_64/sysdep/sigcontext.h rename to 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 similarity index 100% rename from arch/um/sys-x86_64/sysdep/skas_ptrace.h rename to 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 similarity index 100% rename from arch/um/sys-x86_64/sysdep/stub.h rename to 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 similarity index 100% rename from arch/um/sys-x86_64/sysdep/syscalls.h rename to 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 similarity index 100% rename from arch/um/sys-x86_64/sysdep/system.h rename to 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 similarity index 100% rename from arch/um/sys-x86_64/sysdep/tls.h rename to 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 similarity index 100% rename from arch/um/sys-x86_64/sysdep/vm-flags.h rename to arch/um/sys-x86_64/shared/sysdep/vm-flags.h