Skip to content

Commit

Permalink
asm-{alpha,h8300,um,v850,xtensa}/param.h: unbreak HZ for userspace
Browse files Browse the repository at this point in the history
I noticed this because alpha was broken due to the recent commit commit
bdc8078 ("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>
  • Loading branch information
Mike Frysinger authored and Linus Torvalds committed May 15, 2008
1 parent 772279c commit b7cffc1
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 5 deletions.
4 changes: 4 additions & 0 deletions include/asm-alpha/param.h
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
8 changes: 3 additions & 5 deletions include/asm-h8300/param.h
Original file line number Diff line number Diff line change
@@ -1,14 +1,12 @@
#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
Expand Down
2 changes: 2 additions & 0 deletions include/asm-um/param.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 2 additions & 0 deletions include/asm-v850/param.h
Original file line number Diff line number Diff line change
Expand Up @@ -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__ */
2 changes: 2 additions & 0 deletions include/asm-xtensa/param.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit b7cffc1

Please sign in to comment.