[IA64] Fix build for sim_defconfig (10d0aa3c) · Commits · 戴 / test

Commit 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>

arch/ia64/Kconfig

+7 −0

Original line number	Diff line number	Diff line
		@@ -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

include/asm-ia64/param.h

+1 −9

Original line number	Diff line number	Diff line
		@@ -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 USER_HZ HZ
		# define CLOCKS_PER_SEC HZ /* frequency at which times() counts */
		#else

Admin message