uml: add back CONFIG_HZ

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" <hpa@zytor.com>
Signed-off-by: Jeff Dike <jdike@linux.intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/um/Kconfig b/arch/um/Kconfig
index a967d95603cb0a192a770f7dc160642db1720619..99e51d059a02286bb0a80fc25c05f48f64d10058 100644 (file)
--- a/arch/um/Kconfig
+++ b/arch/um/Kconfig
@@ -68,6 +68,10 @@ config IRQ_RELEASE_METHOD
        bool
        default y
 
+config HZ
+       int
+       default 100
+
 menu "UML-specific options"
 
 config STATIC_LINK

diff --git a/include/asm-um/param.h b/include/asm-um/param.h
index f914e7d67b01b8839c7fe185055566131b7d9d33..4cd4a226f8c125d07668b15fbf239370baa58ebe 100644 (file)
--- a/include/asm-um/param.h
+++ b/include/asm-um/param.h
@@ -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