Commit 10d0aa3c authored by Tony Luck's avatar Tony Luck

[IA64] Fix build for sim_defconfig

Commit bdc80787 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: default avatarTony Luck <tony.luck@intel.com>
parent 19af3554
...@@ -232,7 +232,14 @@ config PGTABLE_4 ...@@ -232,7 +232,14 @@ config PGTABLE_4
endchoice endchoice
if IA64_HP_SIM
config HZ
default 32
endif
if !IA64_HP_SIM
source kernel/Kconfig.hz source kernel/Kconfig.hz
endif
config IA64_BRL_EMU config IA64_BRL_EMU
bool bool
......
...@@ -19,15 +19,7 @@ ...@@ -19,15 +19,7 @@
#define MAXHOSTNAMELEN 64 /* max length of hostname */ #define MAXHOSTNAMELEN 64 /* max length of hostname */
#ifdef __KERNEL__ #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 # define HZ CONFIG_HZ
# endif
# define USER_HZ HZ # define USER_HZ HZ
# define CLOCKS_PER_SEC HZ /* frequency at which times() counts */ # define CLOCKS_PER_SEC HZ /* frequency at which times() counts */
#else #else
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment