diff options
| author | Paul Mackerras <paulus@samba.org> | 2008-05-16 09:13:42 -0400 |
|---|---|---|
| committer | Paul Mackerras <paulus@samba.org> | 2008-05-16 09:13:42 -0400 |
| commit | fcff474ea5cb17ff015aa40e92ed86fede41f1e2 (patch) | |
| tree | a99c0e14daaf31cb078812fb2fbc6abadfcd738f /include/asm-h8300/param.h | |
| parent | 541b2755c2ef7dd2242ac606c115daa11e43ef69 (diff) | |
| parent | f26a3988917913b3d11b2bd741601a2c64ab9204 (diff) | |
Merge branch 'linux-2.6' into powerpc-next
Diffstat (limited to 'include/asm-h8300/param.h')
| -rw-r--r-- | include/asm-h8300/param.h | 8 |
1 files changed, 3 insertions, 5 deletions
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 |