diff options
| author | Al Viro <viro@ftp.linux.org.uk> | 2011-08-18 20:01:49 +0100 |
|---|---|---|
| committer | Richard Weinberger <richard@nod.at> | 2011-11-02 14:14:45 +0100 |
| commit | 9e636452d0714b08e4f8f4c58b76c4b7d15ffffa (patch) | |
| tree | c2e9a31b6f219b5d20662725288b948484c10f1f /arch/um | |
| parent | 945581d5bd796a046a42e3ee915bd9ec0c6853ca (diff) | |
| download | blackbird-op-linux-9e636452d0714b08e4f8f4c58b76c4b7d15ffffa.tar.gz blackbird-op-linux-9e636452d0714b08e4f8f4c58b76c4b7d15ffffa.zip | |
um: get rid of kern_constants.h
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Richard Weinberger <richard@nod.at>
Diffstat (limited to 'arch/um')
| -rw-r--r-- | arch/um/Makefile | 11 | ||||
| -rw-r--r-- | arch/um/include/shared/as-layout.h | 2 | ||||
| -rw-r--r-- | arch/um/include/shared/task.h | 2 | ||||
| -rw-r--r-- | arch/um/include/shared/um_malloc.h | 2 | ||||
| -rw-r--r-- | arch/um/include/shared/user.h | 2 |
5 files changed, 5 insertions, 14 deletions
diff --git a/arch/um/Makefile b/arch/um/Makefile index 3aded4e04f87..649aebcc6a4c 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile @@ -25,9 +25,6 @@ include $(srctree)/$(ARCH_DIR)/Makefile-skas SHARED_HEADERS := $(ARCH_DIR)/include/shared ARCH_INCLUDE := -I$(srctree)/$(SHARED_HEADERS) ARCH_INCLUDE += -I$(srctree)/$(ARCH_DIR)/sys-$(SUBARCH)/shared -ifneq ($(KBUILD_SRC),) -ARCH_INCLUDE += -I$(SHARED_HEADERS) -endif KBUILD_CPPFLAGS += -I$(srctree)/$(ARCH_DIR)/sys-$(SUBARCH) # -Dvmap=kernel_vmap prevents anything from referencing the libpcap.o symbol so @@ -87,7 +84,6 @@ endef KBUILD_KCONFIG := arch/um/Kconfig.$(HEADER_ARCH) archprepare: include/generated/user_constants.h -archprepare: $(SHARED_HEADERS)/kern_constants.h LINK-$(CONFIG_LD_SCRIPT_STATIC) += -static LINK-$(CONFIG_LD_SCRIPT_DYN) += -Wl,-rpath,/lib @@ -118,8 +114,7 @@ endef # When cleaning we don't include .config, so we don't include # TT or skas makefiles and don't clean skas_ptregs.h. -CLEAN_FILES += linux x.i gmon.out \ - $(SHARED_HEADERS)/kern_constants.h +CLEAN_FILES += linux x.i gmon.out archclean: @find . \( -name '*.bb' -o -name '*.bbg' -o -name '*.da' \ @@ -146,8 +141,4 @@ endef include/generated/user_constants.h: $(ARCH_DIR)/sys-$(SUBARCH)/user-offsets.s $(call filechk,gen-asm-offsets) -$(SHARED_HEADERS)/kern_constants.h: - $(Q)mkdir -p $(dir $@) - $(Q)echo '#include <generated/asm-offsets.h>' >$@ - export SUBARCH USER_CFLAGS CFLAGS_NO_HARDENING OS HEADER_ARCH DEV_NULL_PATH diff --git a/arch/um/include/shared/as-layout.h b/arch/um/include/shared/as-layout.h index a92b678503cf..896e16602176 100644 --- a/arch/um/include/shared/as-layout.h +++ b/arch/um/include/shared/as-layout.h @@ -6,7 +6,7 @@ #ifndef __START_H__ #define __START_H__ -#include "kern_constants.h" +#include <generated/asm-offsets.h> /* * Stolen from linux/const.h, which can't be directly included since diff --git a/arch/um/include/shared/task.h b/arch/um/include/shared/task.h index 3fe726b3cf48..3db6b58b505e 100644 --- a/arch/um/include/shared/task.h +++ b/arch/um/include/shared/task.h @@ -1,7 +1,7 @@ #ifndef __TASK_H #define __TASK_H -#include <kern_constants.h> +#include <generated/asm-offsets.h> #define TASK_REGS(task) ((struct uml_pt_regs *) &(((char *) (task))[HOST_TASK_REGS])) #define TASK_PID(task) *((int *) &(((char *) (task))[HOST_TASK_PID])) diff --git a/arch/um/include/shared/um_malloc.h b/arch/um/include/shared/um_malloc.h index c554d706d106..6395fef6b69b 100644 --- a/arch/um/include/shared/um_malloc.h +++ b/arch/um/include/shared/um_malloc.h @@ -6,7 +6,7 @@ #ifndef __UM_MALLOC_H__ #define __UM_MALLOC_H__ -#include "kern_constants.h" +#include <generated/asm-offsets.h> extern void *uml_kmalloc(int size, int flags); extern void kfree(const void *ptr); diff --git a/arch/um/include/shared/user.h b/arch/um/include/shared/user.h index 293f7c794faa..2d46f6329aea 100644 --- a/arch/um/include/shared/user.h +++ b/arch/um/include/shared/user.h @@ -6,7 +6,7 @@ #ifndef __USER_H__ #define __USER_H__ -#include "kern_constants.h" +#include <generated/asm-offsets.h> /* * The usual definition - copied here because the kernel provides its own, |
