diff options
| author | Jeff Dike <jdike@addtoit.com> | 2008-02-04 22:31:19 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2008-02-05 09:44:31 -0800 |
| commit | 7281ff952c7b3cbefb14847460e5fe73a2d240e4 (patch) | |
| tree | f2f7b0c103b2c860f6be18a650098fca9a724197 | |
| parent | 438ee6798cd8bfc44da725fca846367e19d86652 (diff) | |
| download | blackbird-op-linux-7281ff952c7b3cbefb14847460e5fe73a2d240e4.tar.gz blackbird-op-linux-7281ff952c7b3cbefb14847460e5fe73a2d240e4.zip | |
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>
| -rw-r--r-- | arch/um/Kconfig | 4 | ||||
| -rw-r--r-- | include/asm-um/param.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/arch/um/Kconfig b/arch/um/Kconfig index a967d95603cb..99e51d059a02 100644 --- 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 f914e7d67b01..4cd4a226f8c1 100644 --- 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 |
