From 61c8ddb74046ec3c0cfc8341f668d88411172d28 Mon Sep 17 00:00:00 2001 From: David Howells Date: Tue, 13 Dec 2011 09:26:45 +0000 Subject: [PATCH] --- yaml --- r: 285004 b: refs/heads/master c: 3d7f1dc195167efcb269e83055672d5c0a6bd650 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-generic/param.h | 13 +++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index b3c01cd58ea2..6b50dcdbb867 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cb0d93505f6e9d2db87a50f402ec022517ec44c8 +refs/heads/master: 3d7f1dc195167efcb269e83055672d5c0a6bd650 diff --git a/trunk/include/asm-generic/param.h b/trunk/include/asm-generic/param.h index cdf8251bfb6c..835632a3b468 100644 --- a/trunk/include/asm-generic/param.h +++ b/trunk/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 */