aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-11 23:44:58 -0500
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-11 23:44:58 -0500
commit1a510089849ff9f70b654659bf976a6baf3a4833 (patch)
tree3de6bfaccff49c13f644621ca139e8cfb3023af8
parent900cf086fd2fbad07f72f4575449e0d0958f860f (diff)
parent10d0aa3c0a03dd04227ab3a4958563d84276d02e (diff)
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 2d4fcd01bc91..dff9edfc7465 100644
--- a/arch/ia64/Kconfig
+++ b/arch/ia64/Kconfig
@@ -232,7 +232,14 @@ config PGTABLE_4
232 232
233endchoice 233endchoice
234 234
235if IA64_HP_SIM
236config HZ
237 default 32
238endif
239
240if !IA64_HP_SIM
235source kernel/Kconfig.hz 241source kernel/Kconfig.hz
242endif
236 243
237config IA64_BRL_EMU 244config IA64_BRL_EMU
238 bool 245 bool
diff --git a/include/asm-ia64/param.h b/include/asm-ia64/param.h
index 49c62dd5eccf..0964c32c1358 100644
--- a/include/asm-ia64/param.h
+++ b/include/asm-ia64/param.h
@@ -19,15 +19,7 @@
19#define MAXHOSTNAMELEN 64 /* max length of hostname */ 19#define MAXHOSTNAMELEN 64 /* max length of hostname */
20 20
21#ifdef __KERNEL__ 21#ifdef __KERNEL__
22# ifdef CONFIG_IA64_HP_SIM 22# define HZ CONFIG_HZ
23 /*
24 * Yeah, simulating stuff is slow, so let us catch some breath between
25 * timer interrupts...
26 */
27# define HZ 32
28# else
29# define HZ CONFIG_HZ
30# endif
31# define USER_HZ HZ 23# define USER_HZ HZ
32# define CLOCKS_PER_SEC HZ /* frequency at which times() counts */ 24# define CLOCKS_PER_SEC HZ /* frequency at which times() counts */
33#else 25#else