diff options
| author | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
|---|---|---|
| committer | Andrea Bastoni <bastoni@cs.unc.edu> | 2010-05-30 19:16:45 -0400 |
| commit | ada47b5fe13d89735805b566185f4885f5a3f750 (patch) | |
| tree | 644b88f8a71896307d71438e9b3af49126ffb22b /arch/mips/include/asm/param.h | |
| parent | 43e98717ad40a4ae64545b5ba047c7b86aa44f4f (diff) | |
| parent | 3280f21d43ee541f97f8cda5792150d2dbec20d5 (diff) | |
Merge branch 'wip-2.6.34' into old-private-masterarchived-private-master
Diffstat (limited to 'arch/mips/include/asm/param.h')
| -rw-r--r-- | arch/mips/include/asm/param.h | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/arch/mips/include/asm/param.h b/arch/mips/include/asm/param.h index 1d9bb8c5ab24..da3920fce9ad 100644 --- a/arch/mips/include/asm/param.h +++ b/arch/mips/include/asm/param.h | |||
| @@ -9,23 +9,8 @@ | |||
| 9 | #ifndef _ASM_PARAM_H | 9 | #ifndef _ASM_PARAM_H |
| 10 | #define _ASM_PARAM_H | 10 | #define _ASM_PARAM_H |
| 11 | 11 | ||
| 12 | #ifdef __KERNEL__ | ||
| 13 | |||
| 14 | # define HZ CONFIG_HZ /* Internal kernel timer frequency */ | ||
| 15 | # define USER_HZ 100 /* .. some user interfaces are in "ticks" */ | ||
| 16 | # define CLOCKS_PER_SEC (USER_HZ) /* like times() */ | ||
| 17 | #endif | ||
| 18 | |||
| 19 | #ifndef HZ | ||
| 20 | #define HZ 100 | ||
| 21 | #endif | ||
| 22 | |||
| 23 | #define EXEC_PAGESIZE 65536 | 12 | #define EXEC_PAGESIZE 65536 |
| 24 | 13 | ||
| 25 | #ifndef NOGROUP | 14 | #include <asm-generic/param.h> |
| 26 | #define NOGROUP (-1) | ||
| 27 | #endif | ||
| 28 | |||
| 29 | #define MAXHOSTNAMELEN 64 /* max length of hostname */ | ||
| 30 | 15 | ||
| 31 | #endif /* _ASM_PARAM_H */ | 16 | #endif /* _ASM_PARAM_H */ |