diff options
author | Mike Frysinger <vapier@gentoo.org> | 2008-05-14 19:05:42 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-05-14 22:11:14 -0400 |
commit | b7cffc1f29c1bc729bc50c863c87f93f9b70994b (patch) | |
tree | 9d29e88769601d8dfd595467d8bd5b41b369be48 | |
parent | 772279c5f1dceb58d451dca94b557fd89b1ce890 (diff) |
asm-{alpha,h8300,um,v850,xtensa}/param.h: unbreak HZ for userspace
I noticed this because alpha was broken due to the recent commit commit
bdc807871d58285737d50dc6163d0feb72cb0dc2 ("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>
-rw-r--r-- | include/asm-alpha/param.h | 4 | ||||
-rw-r--r-- | include/asm-h8300/param.h | 8 | ||||
-rw-r--r-- | include/asm-um/param.h | 2 | ||||
-rw-r--r-- | include/asm-v850/param.h | 2 | ||||
-rw-r--r-- | include/asm-xtensa/param.h | 2 |
5 files changed, 13 insertions, 5 deletions
diff --git a/include/asm-alpha/param.h b/include/asm-alpha/param.h index 0982f1d39499..e691ecfedb2c 100644 --- a/include/asm-alpha/param.h +++ b/include/asm-alpha/param.h | |||
@@ -5,8 +5,12 @@ | |||
5 | hardware ignores reprogramming. We also need userland buy-in to the | 5 | hardware ignores reprogramming. We also need userland buy-in to the |
6 | change in HZ, since this is visible in the wait4 resources etc. */ | 6 | change in HZ, since this is visible in the wait4 resources etc. */ |
7 | 7 | ||
8 | #ifdef __KERNEL__ | ||
8 | #define HZ CONFIG_HZ | 9 | #define HZ CONFIG_HZ |
9 | #define USER_HZ HZ | 10 | #define USER_HZ HZ |
11 | #else | ||
12 | #define HZ 1024 | ||
13 | #endif | ||
10 | 14 | ||
11 | #define EXEC_PAGESIZE 8192 | 15 | #define EXEC_PAGESIZE 8192 |
12 | 16 | ||
diff --git a/include/asm-h8300/param.h b/include/asm-h8300/param.h index 04f64f100379..1c72fb8080ff 100644 --- a/include/asm-h8300/param.h +++ b/include/asm-h8300/param.h | |||
@@ -1,14 +1,12 @@ | |||
1 | #ifndef _H8300_PARAM_H | 1 | #ifndef _H8300_PARAM_H |
2 | #define _H8300_PARAM_H | 2 | #define _H8300_PARAM_H |
3 | 3 | ||
4 | |||
5 | #ifndef HZ | ||
6 | #define HZ CONFIG_HZ | ||
7 | #endif | ||
8 | |||
9 | #ifdef __KERNEL__ | 4 | #ifdef __KERNEL__ |
5 | #define HZ CONFIG_HZ | ||
10 | #define USER_HZ HZ | 6 | #define USER_HZ HZ |
11 | #define CLOCKS_PER_SEC (USER_HZ) | 7 | #define CLOCKS_PER_SEC (USER_HZ) |
8 | #else | ||
9 | #define HZ 100 | ||
12 | #endif | 10 | #endif |
13 | 11 | ||
14 | #define EXEC_PAGESIZE 4096 | 12 | #define EXEC_PAGESIZE 4096 |
diff --git a/include/asm-um/param.h b/include/asm-um/param.h index 4cd4a226f8c1..e44f4e60d16d 100644 --- a/include/asm-um/param.h +++ b/include/asm-um/param.h | |||
@@ -13,6 +13,8 @@ | |||
13 | #define HZ CONFIG_HZ | 13 | #define HZ CONFIG_HZ |
14 | #define USER_HZ 100 /* .. some user interfaces are in "ticks" */ | 14 | #define USER_HZ 100 /* .. some user interfaces are in "ticks" */ |
15 | #define CLOCKS_PER_SEC (USER_HZ) /* frequency at which times() counts */ | 15 | #define CLOCKS_PER_SEC (USER_HZ) /* frequency at which times() counts */ |
16 | #else | ||
17 | #define HZ 100 | ||
16 | #endif | 18 | #endif |
17 | 19 | ||
18 | #endif | 20 | #endif |
diff --git a/include/asm-v850/param.h b/include/asm-v850/param.h index 281832690290..4391f5fe0204 100644 --- a/include/asm-v850/param.h +++ b/include/asm-v850/param.h | |||
@@ -26,6 +26,8 @@ | |||
26 | # define HZ CONFIG_HZ | 26 | # define HZ CONFIG_HZ |
27 | # define USER_HZ 100 | 27 | # define USER_HZ 100 |
28 | # define CLOCKS_PER_SEC USER_HZ | 28 | # define CLOCKS_PER_SEC USER_HZ |
29 | #else | ||
30 | # define HZ 100 | ||
29 | #endif | 31 | #endif |
30 | 32 | ||
31 | #endif /* __V850_PARAM_H__ */ | 33 | #endif /* __V850_PARAM_H__ */ |
diff --git a/include/asm-xtensa/param.h b/include/asm-xtensa/param.h index 82ad34d92d35..ba03d5aeab6b 100644 --- a/include/asm-xtensa/param.h +++ b/include/asm-xtensa/param.h | |||
@@ -15,6 +15,8 @@ | |||
15 | # define HZ CONFIG_HZ /* internal timer frequency */ | 15 | # define HZ CONFIG_HZ /* internal timer frequency */ |
16 | # define USER_HZ 100 /* for user interfaces in "ticks" */ | 16 | # define USER_HZ 100 /* for user interfaces in "ticks" */ |
17 | # define CLOCKS_PER_SEC (USER_HZ) /* frequnzy at which times() counts */ | 17 | # define CLOCKS_PER_SEC (USER_HZ) /* frequnzy at which times() counts */ |
18 | #else | ||
19 | # define HZ 100 | ||
18 | #endif | 20 | #endif |
19 | 21 | ||
20 | #define EXEC_PAGESIZE 4096 | 22 | #define EXEC_PAGESIZE 4096 |