diff options
| author | David Howells <dhowells@redhat.com> | 2011-12-13 10:26:45 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2011-12-13 10:26:45 +0100 |
| commit | 3d7f1dc195167efcb269e83055672d5c0a6bd650 (patch) | |
| tree | 8e2044ae68e03c75f97fcef2c955562539673c10 /include/asm-generic | |
| parent | UAPI: Make FRV use asm-generic/param.h (diff) | |
| download | linux-3d7f1dc195167efcb269e83055672d5c0a6bd650.tar.xz linux-3d7f1dc195167efcb269e83055672d5c0a6bd650.zip | |
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 cdf8251bfb6c..835632a3b468 100644 --- a/include/asm-generic/param.h +++ b/include/asm-generic/param.h @@ -1,12 +1,6 @@ #ifndef __ASM_GENERIC_PARAM_H #define __ASM_GENERIC_PARAM_H -#ifdef __KERNEL__ -# define HZ CONFIG_HZ /* Internal kernel timer frequency */ -# define USER_HZ 100 /* some user interfaces are */ -# define CLOCKS_PER_SEC (USER_HZ) /* in "ticks" like times() */ -#endif - #ifndef HZ #define HZ 100 #endif @@ -21,4 +15,11 @@ #define MAXHOSTNAMELEN 64 /* max length of hostname */ +#ifdef __KERNEL__ +# undef HZ +# define HZ CONFIG_HZ /* Internal kernel timer frequency */ +# define USER_HZ 100 /* some user interfaces are */ +# define CLOCKS_PER_SEC (USER_HZ) /* in "ticks" like times() */ +#endif + #endif /* __ASM_GENERIC_PARAM_H */ |