---

yaml --- r: 4411 b: refs/heads/master c: a652481 h: refs/heads/master i: 4409: 46728d1 4407: edcb27c v: v3
git-mirror · Jul 8, 2005 · 8ef82a1 · 8ef82a1
1 parent 4fe6595
commit 8ef82a1
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dcc83a028552ac34538db52d82446d1da6ea8c22
+refs/heads/master: a6524813e032fb33bd1de807a98f8453414335e4
diff --git a/trunk/arch/sparc64/Kconfig b/trunk/arch/sparc64/Kconfig
@@ -43,6 +43,8 @@ config SPARC64_PAGE_SIZE_4MB
 
 endchoice
 
+source kernel/Kconfig.hz
+
 source "init/Kconfig"
 
 config SYSVIPC_COMPAT

diff --git a/trunk/include/asm-sparc64/param.h b/trunk/include/asm-sparc64/param.h
@@ -1,9 +1,10 @@
-/* $Id: param.h,v 1.2 2000/10/30 21:01:41 davem Exp $ */
 #ifndef _ASMSPARC64_PARAM_H
 #define _ASMSPARC64_PARAM_H
 
+#include <linux/config.h>
+
 #ifdef __KERNEL__
-# define HZ		1000	/* Internal kernel timer frequency */
+# define HZ		CONFIG_HZ	/* Internal kernel timer frequency */
 # define USER_HZ	100	/* .. some user interfaces are in "ticks" */
 # define CLOCKS_PER_SEC (USER_HZ)
 #endif