Commit 6c192938 authored by Russell King's avatar Russell King

[ARM] Fix up include/asm-arm/param.h (and sub-architecture param.h)

for 2.5.25 HZ/USER_HZ changes.
parent 67e6a076
......@@ -11,11 +11,6 @@
* 11-Apr-2001 TTC Created
*/
#ifndef __ASM_ARCH_PARAM_H
#define __ASM_ARCH_PARAM_H
/*
* Reserved for future use
*/
#endif
......@@ -3,5 +3,3 @@
*
* Copyright (C) 1999 Nexus Electronics Ltd
*/
#define HZ 100
......@@ -17,5 +17,3 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#define HZ 100
......@@ -17,5 +17,3 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#define HZ 100
......@@ -17,5 +17,3 @@
* along with this program; if not, write to the Free Software
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#define HZ 100
......@@ -12,21 +12,8 @@
* 04-25-2000 SJH Cleaned up file
* 05-03-2000 SJH Change comments and rate
*/
#ifndef __ASM_ARCH_PARAM_H
#define __ASM_ARCH_PARAM_H
/*
* See 'time.h' for how the RTC HZ rate is set
*/
#define HZ 128
/*
* Define hz_to_std, since we have a non 100Hz define
* (see include/asm-arm/param.h)
*/
#if defined(__KERNEL__)
#define hz_to_std(a) ((a * HZ)/100)
#endif
#endif
#define __KERNEL_HZ 128
......@@ -3,6 +3,3 @@
*
* by Alexander Schulz
*/
#define HZ 100
#define HZ 1000
/*
* linux/include/asm-arm/arch-tbox/param.h
*/
#define __KERNEL_HZ 1000
......@@ -13,11 +13,16 @@
#include <asm/arch/param.h> /* for HZ */
#include <asm/proc/page.h> /* for EXEC_PAGE_SIZE */
#ifndef HZ
#define HZ 100
#ifndef __KERNEL_HZ
#define __KERNEL_HZ 100
#endif
#if defined(__KERNEL__) && (HZ == 100)
#define hz_to_std(a) (a)
#ifdef __KERNEL__
# define HZ __KERNEL_HZ /* Internal kernel timer frequency */
# define USER_HZ 100 /* User interfaces are in "ticks" */
# define CLOCKS_PER_SEC (USER_HZ) /* like times() */
#else
# define HZ 100
#endif
#ifndef NGROUPS
......@@ -31,9 +36,5 @@
/* max length of hostname */
#define MAXHOSTNAMELEN 64
#ifdef __KERNEL__
# define CLOCKS_PER_SEC HZ
#endif
#endif
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment