diff options
author | Tony Luck <tony.luck@intel.com> | 2008-02-11 16:23:46 -0500 |
---|---|---|
committer | Tony Luck <tony.luck@intel.com> | 2008-02-11 16:23:46 -0500 |
commit | 10d0aa3c0a03dd04227ab3a4958563d84276d02e (patch) | |
tree | e4095d367e914e78cededa8bae1c31f58a8b80a8 /arch/ia64 | |
parent | 19af35546de68c872dcb687613e0902a602cb20e (diff) |
[IA64] Fix build for sim_defconfig
Commit bdc807871d58285737d50dc6163d0feb72cb0dc2 broke the build
for this config because the sim_defconfig selects CONFIG_HZ=250
but include/asm-ia64/param.h has an ifdef for the simulator to
force HZ to 32. So we ended up with a kernel/timeconst.h set
for HZ=250 ... which then failed the check for the right HZ
value and died with:
Drop the #ifdef magic from param.h and make force CONFIG_HZ=32
directly for the simulator.
Signed-off-by: Tony Luck <tony.luck@intel.com>
Diffstat (limited to 'arch/ia64')
-rw-r--r-- | arch/ia64/Kconfig | 7 |
1 files changed, 7 insertions, 0 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 | ||
233 | endchoice | 233 | endchoice |
234 | 234 | ||
235 | if IA64_HP_SIM | ||
236 | config HZ | ||
237 | default 32 | ||
238 | endif | ||
239 | |||
240 | if !IA64_HP_SIM | ||
235 | source kernel/Kconfig.hz | 241 | source kernel/Kconfig.hz |
242 | endif | ||
236 | 243 | ||
237 | config IA64_BRL_EMU | 244 | config IA64_BRL_EMU |
238 | bool | 245 | bool |