From d35bc2d7032a41ab345054ee7347a83cc3ed504e Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Wed, 14 May 2008 16:05:42 -0700 Subject: [PATCH] --- yaml --- r: 96739 b: refs/heads/master c: b7cffc1f29c1bc729bc50c863c87f93f9b70994b h: refs/heads/master i: 96737: 60e0b63dd1ebbabe7ac5a7806243392b52094616 96735: 74dd0b01300a7303c69e685183b2bdb2e55093f4 v: v3 --- [refs] | 2 +- trunk/include/asm-alpha/param.h | 4 ++++ trunk/include/asm-h8300/param.h | 8 +++----- trunk/include/asm-um/param.h | 2 ++ trunk/include/asm-v850/param.h | 2 ++ trunk/include/asm-xtensa/param.h | 2 ++ 6 files changed, 14 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index bd33a70d25fa..5a11f4e71928 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 772279c5f1dceb58d451dca94b557fd89b1ce890 +refs/heads/master: b7cffc1f29c1bc729bc50c863c87f93f9b70994b diff --git a/trunk/include/asm-alpha/param.h b/trunk/include/asm-alpha/param.h index 0982f1d39499..e691ecfedb2c 100644 --- a/trunk/include/asm-alpha/param.h +++ b/trunk/include/asm-alpha/param.h @@ -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 diff --git a/trunk/include/asm-h8300/param.h b/trunk/include/asm-h8300/param.h index 04f64f100379..1c72fb8080ff 100644 --- a/trunk/include/asm-h8300/param.h +++ b/trunk/include/asm-h8300/param.h @@ -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 diff --git a/trunk/include/asm-um/param.h b/trunk/include/asm-um/param.h index 4cd4a226f8c1..e44f4e60d16d 100644 --- a/trunk/include/asm-um/param.h +++ b/trunk/include/asm-um/param.h @@ -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 diff --git a/trunk/include/asm-v850/param.h b/trunk/include/asm-v850/param.h index 281832690290..4391f5fe0204 100644 --- a/trunk/include/asm-v850/param.h +++ b/trunk/include/asm-v850/param.h @@ -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__ */ diff --git a/trunk/include/asm-xtensa/param.h b/trunk/include/asm-xtensa/param.h index 82ad34d92d35..ba03d5aeab6b 100644 --- a/trunk/include/asm-xtensa/param.h +++ b/trunk/include/asm-xtensa/param.h @@ -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