summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-11 20:44:58 -0800
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-11 20:44:58 -0800
commit1a510089849ff9f70b654659bf976a6baf3a4833 (patch)
tree3de6bfaccff49c13f644621ca139e8cfb3023af8
parent900cf086fd2fbad07f72f4575449e0d0958f860f (diff)
parent10d0aa3c0a03dd04227ab3a4958563d84276d02e (diff)
downloadop-kernel-dev-1a510089849ff9f70b654659bf976a6baf3a4833.zip
op-kernel-dev-1a510089849ff9f70b654659bf976a6baf3a4833.tar.gz
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6: [IA64] Fix build for sim_defconfig
-rw-r--r--arch/ia64/Kconfig7
-rw-r--r--include/asm-ia64/param.h10
2 files changed, 8 insertions, 9 deletions
diff --git a/arch/ia64/Kconfig b/arch/ia64/Kconfig
index 2d4fcd0..dff9edf 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -232,7 +232,14 @@ config PGTABLE_4
endchoice
+if IA64_HP_SIM
+config HZ
+ default 32
+endif
+
+if !IA64_HP_SIM
source kernel/Kconfig.hz
+endif
config IA64_BRL_EMU
bool
diff --git a/include/asm-ia64/param.h b/include/asm-ia64/param.h
index 49c62dd..0964c32 100644
--- a/include/asm-ia64/param.h
+++ b/include/asm-ia64/param.h
@@ -19,15 +19,7 @@
#define MAXHOSTNAMELEN 64 /* max length of hostname */
#ifdef __KERNEL__
-# ifdef CONFIG_IA64_HP_SIM
- /*
- * Yeah, simulating stuff is slow, so let us catch some breath between
- * timer interrupts...
- */
-# define HZ 32
-# else
-# define HZ CONFIG_HZ
-# endif
+# define HZ CONFIG_HZ
# define USER_HZ HZ
# define CLOCKS_PER_SEC HZ /* frequency at which times() counts */
#else
OpenPOWER on IntegriCloud