Loading arch/um/Makefile +2 −10 Original line number Diff line number Diff line Loading @@ -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 Loading @@ -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. Loading Loading @@ -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),) Loading arch/um/include/shared/sysdep-i386/archsetjmp.h→arch/um/sys-i386/sysdep/archsetjmp.h +0 −0 File moved. View file arch/um/include/shared/sysdep-i386/barrier.h→arch/um/sys-i386/sysdep/barrier.h +0 −0 File moved. View file arch/um/include/shared/sysdep-i386/checksum.h→arch/um/sys-i386/sysdep/checksum.h +0 −0 File moved. View file arch/um/include/shared/sysdep-i386/faultinfo.h→arch/um/sys-i386/sysdep/faultinfo.h +0 −0 File moved. View file Loading
arch/um/Makefile +2 −10 Original line number Diff line number Diff line Loading @@ -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 Loading @@ -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. Loading Loading @@ -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),) Loading
arch/um/include/shared/sysdep-i386/archsetjmp.h→arch/um/sys-i386/sysdep/archsetjmp.h +0 −0 File moved. View file
arch/um/include/shared/sysdep-i386/barrier.h→arch/um/sys-i386/sysdep/barrier.h +0 −0 File moved. View file
arch/um/include/shared/sysdep-i386/checksum.h→arch/um/sys-i386/sysdep/checksum.h +0 −0 File moved. View file
arch/um/include/shared/sysdep-i386/faultinfo.h→arch/um/sys-i386/sysdep/faultinfo.h +0 −0 File moved. View file