diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-30 03:20:56 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2012-10-30 03:20:56 -0400 |
| commit | 53279f36dccffc26ff536003fd6bb97cc21c3b82 (patch) | |
| tree | 9d16e497c0e4158c7c054c479bd0e9ff0388d7bb /include/asm-generic/param.h | |
| parent | a6e8c0a25377e27958b11b20e1927885ae7c9857 (diff) | |
| parent | 8f0d8163b50e01f398b14bcd4dc039ac5ab18d64 (diff) | |
Merge tag 'v3.7-rc3' into next to sync up with recent USB and MFD changes
Diffstat (limited to 'include/asm-generic/param.h')
| -rw-r--r-- | include/asm-generic/param.h | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/include/asm-generic/param.h b/include/asm-generic/param.h index 835632a3b468..04e715bccceb 100644 --- a/include/asm-generic/param.h +++ b/include/asm-generic/param.h | |||
| @@ -1,25 +1,10 @@ | |||
| 1 | #ifndef __ASM_GENERIC_PARAM_H | 1 | #ifndef __ASM_GENERIC_PARAM_H |
| 2 | #define __ASM_GENERIC_PARAM_H | 2 | #define __ASM_GENERIC_PARAM_H |
| 3 | 3 | ||
| 4 | #ifndef HZ | 4 | #include <uapi/asm-generic/param.h> |
| 5 | #define HZ 100 | ||
| 6 | #endif | ||
| 7 | 5 | ||
| 8 | #ifndef EXEC_PAGESIZE | ||
| 9 | #define EXEC_PAGESIZE 4096 | ||
| 10 | #endif | ||
| 11 | |||
| 12 | #ifndef NOGROUP | ||
| 13 | #define NOGROUP (-1) | ||
| 14 | #endif | ||
| 15 | |||
| 16 | #define MAXHOSTNAMELEN 64 /* max length of hostname */ | ||
| 17 | |||
| 18 | #ifdef __KERNEL__ | ||
| 19 | # undef HZ | 6 | # undef HZ |
| 20 | # define HZ CONFIG_HZ /* Internal kernel timer frequency */ | 7 | # define HZ CONFIG_HZ /* Internal kernel timer frequency */ |
| 21 | # define USER_HZ 100 /* some user interfaces are */ | 8 | # define USER_HZ 100 /* some user interfaces are */ |
| 22 | # define CLOCKS_PER_SEC (USER_HZ) /* in "ticks" like times() */ | 9 | # define CLOCKS_PER_SEC (USER_HZ) /* in "ticks" like times() */ |
| 23 | #endif | ||
| 24 | |||
| 25 | #endif /* __ASM_GENERIC_PARAM_H */ | 10 | #endif /* __ASM_GENERIC_PARAM_H */ |