From d507462c63c7423ae9b9378ed049909a646d28f7 Mon Sep 17 00:00:00 2001 From: David Howells Date: Mon, 12 Dec 2011 13:56:03 +0000 Subject: [PATCH] UAPI: Make M32R use asm-generic/param.h Make M32R use the generic settings to be found in asm-generic/param.h rather than defining its own as they're exactly the same. This sorts out a problem with HZ being redefined after the splitting of userspace headers from kernel headers. Signed-off-by: David Howells cc: Hirokazu Takata cc: linux-m32r@ml.linux-m32r.org --- arch/m32r/include/asm/param.h | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/arch/m32r/include/asm/param.h b/arch/m32r/include/asm/param.h index 94c770196048..fa207bdf96e7 100644 --- a/arch/m32r/include/asm/param.h +++ b/arch/m32r/include/asm/param.h @@ -1,23 +1,7 @@ #ifndef _ASM_M32R_PARAM_H #define _ASM_M32R_PARAM_H -#ifdef __KERNEL__ -# define HZ CONFIG_HZ /* Internal kernel timer frequency */ -# define USER_HZ 100 /* .. some user interfaces are in "ticks" */ -# define CLOCKS_PER_SEC (USER_HZ) /* like times() */ -#endif - -#ifndef HZ -#define HZ 100 -#endif - -#define EXEC_PAGESIZE 4096 - -#ifndef NOGROUP -#define NOGROUP (-1) -#endif - -#define MAXHOSTNAMELEN 64 /* max length of hostname */ +#include #endif /* _ASM_M32R_PARAM_H */