asm-{alpha,h8300,um,v850,xtensa}/param.h: unbreak HZ for userspace (b7cffc1f) · Commits · 戴 / test

I noticed this because alpha was broken due to the recent commit commit ("avoid overflows in kernel/time.c"). Most arches do something like this in their asm/param.h: #ifdef __KERNEL__ # define HZ CONFIG_HZ #else # define HZ 100 #endif A few arches though (namely alpha/h8300/um/v850/xtensa) either do no set HZ at all for !__KERNEL__, or they set it wrongly. This should bring all arches in line by setting up HZ for userspace. Without this currently perl 5.10 doesn't build on alpha: perl.c: In function 'perl_construct': perl.c:388: error: 'CONFIG_HZ' undeclared (first use in this function) -> http://buildd.debian.org/fetch.cgi?pkg=perl;ver=5.10.0-10;arch=alpha;stamp=1210252894 Signed-off-by:

Mike Frysinger <vapier@gentoo.org> Cc: Richard Henderson <rth@twiddle.net> Cc: Ivan Kokshaysky <ink@jurassic.park.msu.ru> Cc: Yoshinori Sato <ysato@users.sourceforge.jp> Cc: Jeff Dike <jdike@addtoit.com> Cc: Chris Zankel <chris@zankel.net> Cc: maximilian attems <max@stro.at> Signed-off-by:

Andrew Morton <akpm@linux-foundation.org> [ HZ on alpha is 1024 for historical reasons. - Linus ] Signed-off-by:

Linus Torvalds <torvalds@linux-foundation.org>

include/asm-alpha/param.h

+4 −0

Original line number	Diff line number	Diff line
		@@ -5,8 +5,12 @@
		hardware ignores reprogramming. We also need userland buy-in to the
		change in HZ, since this is visible in the wait4 resources etc. */

		#ifdef __KERNEL__
		#define HZ CONFIG_HZ
		#define USER_HZ HZ
		#else
		#define HZ 1024
		#endif

		#define EXEC_PAGESIZE 8192

include/asm-h8300/param.h

+3 −5

Original line number	Diff line number	Diff line
		#ifndef _H8300_PARAM_H
		#define _H8300_PARAM_H


		#ifndef HZ
		#define HZ CONFIG_HZ
		#endif

		#ifdef __KERNEL__
		#define HZ CONFIG_HZ
		#define USER_HZ HZ
		#define CLOCKS_PER_SEC (USER_HZ)
		#else
		#define HZ 100
		#endif

		#define EXEC_PAGESIZE 4096

include/asm-um/param.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -13,6 +13,8 @@
		#define HZ CONFIG_HZ
		#define USER_HZ 100 /* .. some user interfaces are in "ticks" */
		#define CLOCKS_PER_SEC (USER_HZ) /* frequency at which times() counts */
		#else
		#define HZ 100
		#endif

		#endif

include/asm-v850/param.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,8 @@
		# define HZ CONFIG_HZ
		# define USER_HZ 100
		# define CLOCKS_PER_SEC USER_HZ
		#else
		# define HZ 100
		#endif

		#endif /* __V850_PARAM_H__ */

include/asm-xtensa/param.h

+2 −0

Original line number	Diff line number	Diff line
		@@ -15,6 +15,8 @@
		# define HZ CONFIG_HZ /* internal timer frequency */
		# define USER_HZ 100 /* for user interfaces in "ticks" */
		# define CLOCKS_PER_SEC (USER_HZ) /* frequnzy at which times() counts */
		#else
		# define HZ 100
		#endif

		#define EXEC_PAGESIZE 4096

Admin message