diff options
| author | Tony Luck <tony.luck@intel.com> | 2008-02-11 13:23:46 -0800 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2008-02-11 13:23:46 -0800 |
| commit | 10d0aa3c0a03dd04227ab3a4958563d84276d02e (patch) | |
| tree | e4095d367e914e78cededa8bae1c31f58a8b80a8 | |
| parent | 19af35546de68c872dcb687613e0902a602cb20e (diff) | |
| download | linux-stable-10d0aa3c0a03dd04227ab3a4958563d84276d02e.tar.gz linux-stable-10d0aa3c0a03dd04227ab3a4958563d84276d02e.tar.bz2 linux-stable-10d0aa3c0a03dd04227ab3a4958563d84276d02e.zip | |
[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>
| -rw-r--r-- | arch/ia64/Kconfig | 7 | ||||
| -rw-r--r-- | include/asm-ia64/param.h | 10 |
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 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 49c62dd5eccf..0964c32c1358 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 |