From 80b74788820c16980bb60f545c78f1b824ea7dd8 Mon Sep 17 00:00:00 2001 From: Christoph Lameter Date: Thu, 23 Jun 2005 00:08:27 -0700 Subject: [PATCH] --- yaml --- r: 2887 b: refs/heads/master c: b5d23e5b8c7ecd97d32f6ad7680d9909977580a7 h: refs/heads/master i: 2885: 1a2e1a5dd7accb4c7d2d29a159bc37d2e8e19e94 2883: d060d9b9cdc3994fd1a40d5943bf05c5b1919de2 2879: 5c17fc297a979719ea8ee25b47eb0744c8871cc0 v: v3 --- [refs] | 2 +- trunk/arch/ia64/Kconfig | 2 ++ trunk/include/asm-ia64/param.h | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 23f9399b8e86..20ed209abde6 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 59121003721a8fad11ee72e646fd9d3076b5679c +refs/heads/master: b5d23e5b8c7ecd97d32f6ad7680d9909977580a7 diff --git a/trunk/arch/ia64/Kconfig b/trunk/arch/ia64/Kconfig index 9f6a46caba9b..01b78e7f992e 100644 --- a/trunk/arch/ia64/Kconfig +++ b/trunk/arch/ia64/Kconfig @@ -161,6 +161,8 @@ config IA64_PAGE_SIZE_64KB endchoice +source kernel/Kconfig.hz + config IA64_BRL_EMU bool depends on ITANIUM diff --git a/trunk/include/asm-ia64/param.h b/trunk/include/asm-ia64/param.h index 6c6b679b7a9e..5e1e0d2d7baf 100644 --- a/trunk/include/asm-ia64/param.h +++ b/trunk/include/asm-ia64/param.h @@ -27,7 +27,7 @@ */ # define HZ 32 # else -# define HZ 1024 +# define HZ CONFIG_HZ # endif # define USER_HZ HZ # define CLOCKS_PER_SEC HZ /* frequency at which times() counts */