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/include | |
| parent | 61bee20445935ee9802d25c261849440497497d3 (diff) | |
| download | op-kernel-dev-87e299e5c7508a9443f04703f1d0c7f518f79ea9.zip op-kernel-dev-87e299e5c7508a9443f04703f1d0c7f518f79ea9.tar.gz | |
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/include')
| -rw-r--r-- | arch/um/include/shared/common-offsets.h | 13 | ||||
| -rw-r--r-- | arch/um/include/shared/user.h | 2 |
2 files changed, 14 insertions, 1 deletions
diff --git a/arch/um/include/shared/common-offsets.h b/arch/um/include/shared/common-offsets.h index b54bd35..72009c7 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 1723fac..293f7c7 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, |
