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 | |
| parent | 887c57d480ee9dbfec53f2539359dd289f50acab (diff) | |
| download | linux-ec82c32d45644998a28abad0a6a9ccdd721a054e.tar.gz linux-ec82c32d45644998a28abad0a6a9ccdd721a054e.tar.bz2 linux-ec82c32d45644998a28abad0a6a9ccdd721a054e.zip | |
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')
| -rw-r--r-- | arch/um/Makefile | 15 | ||||
| -rw-r--r-- | arch/um/Makefile-os-Linux | 1 | ||||
| -rw-r--r-- | arch/um/drivers/Makefile | 1 | ||||
| -rw-r--r-- | arch/um/include/shared/os.h | 1 | ||||
| -rw-r--r-- | arch/um/os-Linux/include/file.h | 11 |
5 files changed, 4 insertions, 25 deletions
diff --git a/arch/um/Makefile b/arch/um/Makefile index 2606bdaefcb6..10894405ca75 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 diff --git a/arch/um/Makefile-os-Linux b/arch/um/Makefile-os-Linux index 52859487c95d..2c8a598ec14b 100644 --- a/arch/um/Makefile-os-Linux +++ b/arch/um/Makefile-os-Linux @@ -6,3 +6,4 @@ # To get a definition of F_SETSIG USER_CFLAGS += -D_GNU_SOURCE -D_LARGEFILE64_SOURCE KBUILD_CFLAGS += -D_LARGEFILE64_SOURCE +DEV_NULL_PATH = \"/dev/null\" diff --git a/arch/um/drivers/Makefile b/arch/um/drivers/Makefile index d283e7b022a0..1d9b6ae967b0 100644 --- a/arch/um/drivers/Makefile +++ b/arch/um/drivers/Makefile @@ -62,5 +62,6 @@ obj-$(CONFIG_UML_RANDOM) += random.o # pcap_user.o must be added explicitly. USER_OBJS := fd.o null.o pty.o tty.o xterm.o slip_common.o pcap_user.o vde_user.o +CFLAGS_null.o = -DDEV_NULL=$(DEV_NULL_PATH) include arch/um/scripts/Makefile.rules diff --git a/arch/um/include/shared/os.h b/arch/um/include/shared/os.h index 2aaffa04fc8f..cd40fddcf99d 100644 --- a/arch/um/include/shared/os.h +++ b/arch/um/include/shared/os.h @@ -11,7 +11,6 @@ #include "longjmp.h" #include "mm_id.h" #include "sysdep/tls.h" -#include "../../os/include/file.h" #define CATCH_EINTR(expr) while ((errno = 0, ((expr) < 0)) && (errno == EINTR)) diff --git a/arch/um/os-Linux/include/file.h b/arch/um/os-Linux/include/file.h deleted file mode 100644 index fe71be24bd59..000000000000 --- a/arch/um/os-Linux/include/file.h +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (C) 2002 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com) - * Licensed under the GPL - */ - -#ifndef __OS_FILE_H__ -#define __OS_FILE_H__ - -#define DEV_NULL "/dev/null" - -#endif |