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 /include/asm-ia64/param.h | |
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 'include/asm-ia64/param.h')
-rw-r--r-- | include/asm-ia64/param.h | 10 |
1 files changed, 1 insertions, 9 deletions
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 |