From 9e636452d0714b08e4f8f4c58b76c4b7d15ffffa Mon Sep 17 00:00:00 2001 From: Al Viro Date: Thu, 18 Aug 2011 20:01:49 +0100 Subject: [PATCH] um: get rid of kern_constants.h Signed-off-by: Al Viro Signed-off-by: Richard Weinberger --- arch/um/Makefile | 11 +---------- arch/um/include/shared/as-layout.h | 2 +- arch/um/include/shared/task.h | 2 +- arch/um/include/shared/um_malloc.h | 2 +- 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 ' >$@ - 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 /* * 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 +#include #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 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 /* * The usual definition - copied here because the kernel provides its own, -- 2.20.1