diff options
author | David Howells <dhowells@redhat.com> | 2011-12-12 08:56:04 -0500 |
---|---|---|
committer | David Howells <dhowells@redhat.com> | 2011-12-12 08:56:04 -0500 |
commit | cb0d93505f6e9d2db87a50f402ec022517ec44c8 (patch) | |
tree | 9519a8e4a063e986f8c05218b0a0a1c46a73cbe6 /arch/frv | |
parent | d507462c63c7423ae9b9378ed049909a646d28f7 (diff) |
UAPI: Make FRV use asm-generic/param.h
Make FRV use the generic settings to be found in asm-generic/param.h where
possible rather than defining its own as they're mostly exactly the same.
This sorts out a problem with HZ being redefined after the UAPI split.
Signed-off-by: David Howells <dhowells@redhat.com>
Diffstat (limited to 'arch/frv')
-rw-r--r-- | arch/frv/include/asm/param.h | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/arch/frv/include/asm/param.h b/arch/frv/include/asm/param.h index 6859dd503ed3..a52dca9a9566 100644 --- a/arch/frv/include/asm/param.h +++ b/arch/frv/include/asm/param.h | |||
@@ -1,22 +1,8 @@ | |||
1 | #ifndef _ASM_PARAM_H | 1 | #ifndef _ASM_PARAM_H |
2 | #define _ASM_PARAM_H | 2 | #define _ASM_PARAM_H |
3 | 3 | ||
4 | #ifdef __KERNEL__ | ||
5 | #define HZ CONFIG_HZ /* Internal kernel timer frequency */ | ||
6 | #define USER_HZ 100 /* .. some user interfaces are in "ticks" */ | ||
7 | #define CLOCKS_PER_SEC (USER_HZ) /* like times() */ | ||
8 | #endif | ||
9 | |||
10 | #ifndef HZ | ||
11 | #define HZ 100 | ||
12 | #endif | ||
13 | |||
14 | #define EXEC_PAGESIZE 16384 | 4 | #define EXEC_PAGESIZE 16384 |
15 | 5 | ||
16 | #ifndef NOGROUP | 6 | #include <asm-generic/param.h> |
17 | #define NOGROUP (-1) | ||
18 | #endif | ||
19 | |||
20 | #define MAXHOSTNAMELEN 64 /* max length of hostname */ | ||
21 | 7 | ||
22 | #endif /* _ASM_PARAM_H */ | 8 | #endif /* _ASM_PARAM_H */ |