diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2008-08-25 04:14:29 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-10-22 22:55:22 -0700 |
| commit | ec82c32d45644998a28abad0a6a9ccdd721a054e (patch) | |
| tree | 191b1828648cd3a6faf54438e9748e212211bc9b /arch/um/Makefile | |
| parent | 887c57d480ee9dbfec53f2539359dd289f50acab (diff) | |
x86, um: get rid of arch/um/os symlink
we can get DEV_NULL defined for arch/um/drivers/null.c in less
convoluted ways, TYVM...
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'arch/um/Makefile')
| -rw-r--r-- | arch/um/Makefile | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/arch/um/Makefile b/arch/um/Makefile index 2606bdaefcb..10894405ca7 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile @@ -18,12 +18,9 @@ core-y += $(ARCH_DIR)/kernel/ \ $(ARCH_DIR)/drivers/ \ $(ARCH_DIR)/os-$(OS)/ -# 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_DIR)/include/shared/uml-config.h +ARCH_SYMLINKS = $(ARCH_DIR)/include/shared/uml-config.h MODE_INCLUDE += -I$(srctree)/$(ARCH_DIR)/include/shared/skas @@ -143,14 +140,6 @@ $(objtree)/$(ARCH_DIR)/include/shared: @echo ' MKDIR $@' $(Q)mkdir -p $@ -$(ARCH_DIR)/os: - @echo ' SYMLINK $@' -ifneq ($(KBUILD_SRC),) - $(Q)ln -fsn $(srctree)/$(ARCH_DIR)/os-$(OS) $@ -else - $(Q)ln -fsn os-$(OS) $@ -endif - # Generated files define filechk_umlconfig sed 's/ CONFIG/ UML_CONFIG/' @@ -182,4 +171,4 @@ $(ARCH_DIR)/include/shared/kern_constants.h: $(objtree)/$(ARCH_DIR)/include/shar @echo ' SYMLINK $@' $(Q)ln -sf ../../../../include/asm/asm-offsets.h $@ -export SUBARCH USER_CFLAGS CFLAGS_NO_HARDENING OS HEADER_ARCH +export SUBARCH USER_CFLAGS CFLAGS_NO_HARDENING OS HEADER_ARCH DEV_NULL_PATH |