diff options
author | David Howells <dhowells@redhat.com> | 2011-12-13 04:26:45 -0500 |
---|---|---|
committer | David Howells <dhowells@redhat.com> | 2011-12-13 04:26:45 -0500 |
commit | 3d7f1dc195167efcb269e83055672d5c0a6bd650 (patch) | |
tree | 8e2044ae68e03c75f97fcef2c955562539673c10 /include/asm-generic | |
parent | cb0d93505f6e9d2db87a50f402ec022517ec44c8 (diff) |
UAPI: Rearrange definition of HZ in asm-generic/param.h
Rearrange the definition of HZ in asm-generic/param.h so that the user-specific
is declared before the kernel-specific one. We then explicitly #undef the
userspace HZ value and replace it with the kernel HZ value.
This allows the userspace params to be excised into a separate header as part
of the UAPI header split.
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'include/asm-generic')
-rw-r--r-- | include/asm-generic/param.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/include/asm-generic/param.h b/include/asm-generic/param.h index cdf8251bfb6..835632a3b46 100644 --- a/include/asm-generic/param.h +++ b/include/asm-generic/param.h | |||
@@ -1,12 +1,6 @@ | |||
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 | #ifdef __KERNEL__ | ||
5 | # define HZ CONFIG_HZ /* Internal kernel timer frequency */ | ||
6 | # define USER_HZ 100 /* some user interfaces are */ | ||
7 | # define CLOCKS_PER_SEC (USER_HZ) /* in "ticks" like times() */ | ||
8 | #endif | ||
9 | |||
10 | #ifndef HZ | 4 | #ifndef HZ |
11 | #define HZ 100 | 5 | #define HZ 100 |
12 | #endif | 6 | #endif |
@@ -21,4 +15,11 @@ | |||
21 | 15 | ||
22 | #define MAXHOSTNAMELEN 64 /* max length of hostname */ | 16 | #define MAXHOSTNAMELEN 64 /* max length of hostname */ |
23 | 17 | ||
18 | #ifdef __KERNEL__ | ||
19 | # undef HZ | ||
20 | # define HZ CONFIG_HZ /* Internal kernel timer frequency */ | ||
21 | # define USER_HZ 100 /* some user interfaces are */ | ||
22 | # define CLOCKS_PER_SEC (USER_HZ) /* in "ticks" like times() */ | ||
23 | #endif | ||
24 | |||
24 | #endif /* __ASM_GENERIC_PARAM_H */ | 25 | #endif /* __ASM_GENERIC_PARAM_H */ |