diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2008-10-11 18:39:18 -0400 |
|---|---|---|
| committer | H. Peter Anvin <hpa@zytor.com> | 2008-10-22 22:55:23 -0700 |
| commit | 87e299e5c7508a9443f04703f1d0c7f518f79ea9 (patch) | |
| tree | 88563f04c14fd85fefbc79e272d7ccb3a5af88f9 /arch/um | |
| parent | 61bee20445935ee9802d25c261849440497497d3 (diff) | |
| download | linux-87e299e5c7508a9443f04703f1d0c7f518f79ea9.tar.bz2 | |
x86, um: get rid of uml-config.h
Take a few symbols we need into kern_constants.h
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 | 18 | ||||
| -rw-r--r-- | arch/um/include/shared/common-offsets.h | 13 | ||||
| -rw-r--r-- | arch/um/include/shared/user.h | 2 |
3 files changed, 17 insertions, 16 deletions
diff --git a/arch/um/Makefile b/arch/um/Makefile index 425b81939619..d944c343acdb 100644 --- a/arch/um/Makefile +++ b/arch/um/Makefile @@ -18,10 +18,6 @@ core-y += $(ARCH_DIR)/kernel/ \ $(ARCH_DIR)/drivers/ \ $(ARCH_DIR)/os-$(OS)/ -# 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/uml-config.h - MODE_INCLUDE += -I$(srctree)/$(ARCH_DIR)/include/shared/skas include $(srctree)/$(ARCH_DIR)/Makefile-skas @@ -29,7 +25,7 @@ include $(srctree)/$(ARCH_DIR)/Makefile-skas ARCH_INCLUDE := -I$(srctree)/$(ARCH_DIR)/include/shared ARCH_INCLUDE += -I$(srctree)/$(ARCH_DIR)/sys-$(SUBARCH)/shared ifneq ($(KBUILD_SRC),) -ARCH_INCLUDE += -I$(ARCH_DIR)/include/shared # for three generated files +ARCH_INCLUDE += -I$(ARCH_DIR)/include/shared # for two generated files endif KBUILD_CPPFLAGS += -I$(srctree)/$(ARCH_DIR)/sys-$(SUBARCH) @@ -89,7 +85,7 @@ endef KBUILD_KCONFIG := arch/um/Kconfig.$(HEADER_ARCH) -archprepare: $(ARCH_SYMLINKS) $(ARCH_DIR)/include/shared/user_constants.h +archprepare: $(ARCH_DIR)/include/shared/user_constants.h prepare: $(ARCH_DIR)/include/shared/kern_constants.h LINK-$(CONFIG_LD_SCRIPT_STATIC) += -static @@ -122,12 +118,10 @@ 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 $(ARCH_DIR)/include/shared/uml-config.h \ +CLEAN_FILES += linux x.i gmon.out \ $(ARCH_DIR)/include/shared/user_constants.h \ $(ARCH_DIR)/include/shared/kern_constants.h -MRPROPER_FILES += $(ARCH_SYMLINKS) - archclean: @find . \( -name '*.bb' -o -name '*.bbg' -o -name '*.da' \ -o -name '*.gcov' \) -type f -print | xargs rm -f @@ -137,12 +131,6 @@ $(objtree)/$(ARCH_DIR)/include/shared: $(Q)mkdir -p $@ # Generated files -define filechk_umlconfig - sed 's/ CONFIG/ UML_CONFIG/' -endef - -$(ARCH_DIR)/include/shared/uml-config.h : include/linux/autoconf.h - $(call filechk,umlconfig) $(ARCH_DIR)/sys-$(SUBARCH)/user-offsets.s: FORCE $(Q)$(MAKE) $(build)=$(ARCH_DIR)/sys-$(SUBARCH) $@ diff --git a/arch/um/include/shared/common-offsets.h b/arch/um/include/shared/common-offsets.h index b54bd35585c2..72009c7e3210 100644 --- a/arch/um/include/shared/common-offsets.h +++ b/arch/um/include/shared/common-offsets.h @@ -39,3 +39,16 @@ DEFINE(UM_HZ, HZ); DEFINE(UM_USEC_PER_SEC, USEC_PER_SEC); DEFINE(UM_NSEC_PER_SEC, NSEC_PER_SEC); DEFINE(UM_NSEC_PER_USEC, NSEC_PER_USEC); + +#ifdef CONFIG_PRINTK +DEFINE(UML_CONFIG_PRINTK, CONFIG_PRINTK); +#endif +#ifdef CONFIG_NO_HZ +DEFINE(UML_CONFIG_NO_HZ, CONFIG_NO_HZ); +#endif +#ifdef CONFIG_UML_X86 +DEFINE(UML_CONFIG_UML_X86, CONFIG_UML_X86); +#endif +#ifdef CONFIG_64BIT +DEFINE(UML_CONFIG_64BIT, CONFIG_64BIT); +#endif diff --git a/arch/um/include/shared/user.h b/arch/um/include/shared/user.h index 1723fac6f40d..293f7c794faa 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 "uml-config.h" +#include "kern_constants.h" /* * The usual definition - copied here because the kernel provides its own, |