From: Jeff D. <jd...@ad...> - 2008-01-17 21:41:01
|
avoid-overflows-in-kernel-timec.patch makes CONFIG_HZ necessary for a successful build. UML lacks a definition, so this patch adds one. It also changes the hard-wired definition of HZ to CONFIG_HZ. Note: this patch is a good idea even in the absence of hpa's time fixes. Cc: "H. Peter Anvin" <hp...@zy...> Signed-off-by: Jeff Dike <jd...@li...> --- arch/um/Kconfig | 4 ++++ include/asm-um/param.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) Index: linux-2.6.22/arch/um/Kconfig =================================================================== --- linux-2.6.22.orig/arch/um/Kconfig 2008-01-01 17:32:04.000000000 -0500 +++ linux-2.6.22/arch/um/Kconfig 2008-01-02 11:16:44.000000000 -0500 @@ -68,6 +68,10 @@ config IRQ_RELEASE_METHOD bool default y +config HZ + int + default 100 + menu "UML-specific options" config STATIC_LINK Index: linux-2.6.22/include/asm-um/param.h =================================================================== --- linux-2.6.22.orig/include/asm-um/param.h 2007-07-08 19:32:17.000000000 -0400 +++ linux-2.6.22/include/asm-um/param.h 2008-01-02 11:18:44.000000000 -0500 @@ -10,7 +10,7 @@ #define MAXHOSTNAMELEN 64 /* max length of hostname */ #ifdef __KERNEL__ -#define HZ 100 +#define HZ CONFIG_HZ #define USER_HZ 100 /* .. some user interfaces are in "ticks" */ #define CLOCKS_PER_SEC (USER_HZ) /* frequency at which times() counts */ #endif |