From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Howells Subject: [PATCH 06/17] UAPI: Make FRV use asm-generic/param.h Date: Tue, 13 Dec 2011 10:04:02 +0000 Message-ID: <1323770653-19177-7-git-send-email-dhowells@redhat.com> References: <1323770653-19177-1-git-send-email-dhowells@redhat.com> Return-path: In-Reply-To: <1323770653-19177-1-git-send-email-dhowells@redhat.com> Sender: linux-kernel-owner@vger.kernel.org To: sfr@canb.auug.org.au, torvalds@linux-foundation.org Cc: arnd@arndb.de, dhowells@redhat.com, alan@lxorguk.ukuu.org.uk, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org List-Id: linux-arch.vger.kernel.org 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 --- 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 6859dd5..a52dca9 100644 --- a/arch/frv/include/asm/param.h +++ b/arch/frv/include/asm/param.h @@ -1,22 +1,8 @@ #ifndef _ASM_PARAM_H #define _ASM_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 16384 -#ifndef NOGROUP -#define NOGROUP (-1) -#endif - -#define MAXHOSTNAMELEN 64 /* max length of hostname */ +#include #endif /* _ASM_PARAM_H */ -- 1.7.7.4 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from warthog.procyon.org.uk ([90.155.74.18]:52178 "EHLO warthog.procyon.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754490Ab1LMKkE (ORCPT ); Tue, 13 Dec 2011 05:40:04 -0500 From: David Howells Subject: [PATCH 06/17] UAPI: Make FRV use asm-generic/param.h Date: Tue, 13 Dec 2011 10:04:02 +0000 Message-ID: <1323770653-19177-7-git-send-email-dhowells@redhat.com> In-Reply-To: <1323770653-19177-1-git-send-email-dhowells@redhat.com> References: <1323770653-19177-1-git-send-email-dhowells@redhat.com> Sender: linux-arch-owner@vger.kernel.org List-ID: To: sfr@canb.auug.org.au, torvalds@linux-foundation.org Cc: arnd@arndb.de, dhowells@redhat.com, alan@lxorguk.ukuu.org.uk, linux-kernel@vger.kernel.org, linux-arch@vger.kernel.org Message-ID: <20111213100402.xlUjBcuxyDVVH19CtLODE0TrVbstaX2UH5F0658XRIA@z> 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 --- 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 6859dd5..a52dca9 100644 --- a/arch/frv/include/asm/param.h +++ b/arch/frv/include/asm/param.h @@ -1,22 +1,8 @@ #ifndef _ASM_PARAM_H #define _ASM_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 16384 -#ifndef NOGROUP -#define NOGROUP (-1) -#endif - -#define MAXHOSTNAMELEN 64 /* max length of hostname */ +#include #endif /* _ASM_PARAM_H */ -- 1.7.7.4