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

for 2.5.25 HZ/USER_HZ changes.

diff --git a/include/asm-arm/arch-adifcc/param.h b/include/asm-arm/arch-adifcc/param.h
index e825e31e02526c5aae746e255d90f1235b8aaeea..b1a410eff447029655ca0a86464a9f877050766e 100644 (file)
--- a/include/asm-arm/arch-adifcc/param.h
+++ b/include/asm-arm/arch-adifcc/param.h
@@ -1,3 +1,3 @@
 /*
- * linux/include/asm-arm/arch-adifcc/param.h
+ *  linux/include/asm-arm/arch-adifcc/param.h
  */

diff --git a/include/asm-arm/arch-anakin/param.h b/include/asm-arm/arch-anakin/param.h
index 704b3f8bf055d5b8cd0704d79d18bf1dcb8d40cc..d0a7fb9d5422ea09d87475a2c1396a44e50fbbf8 100644 (file)
--- a/include/asm-arm/arch-anakin/param.h
+++ b/include/asm-arm/arch-anakin/param.h
@@ -11,11 +11,6 @@
  *   11-Apr-2001 TTC   Created
  */
 
-#ifndef __ASM_ARCH_PARAM_H
-#define __ASM_ARCH_PARAM_H
-
 /*
  * Reserved for future use
  */
-
-#endif

diff --git a/include/asm-arm/arch-arc/param.h b/include/asm-arm/arch-arc/param.h
index 16b3fc0e4a10fa42ba3c59255155cc28a4a55be2..de5766d5e1bdc5a0c7371d15d18a91f1be9540e5 100644 (file)
--- a/include/asm-arm/arch-arc/param.h
+++ b/include/asm-arm/arch-arc/param.h
@@ -1,3 +1,3 @@
 /*
- * linux/include/asm-arm/arch-arc/param.h
+ *  linux/include/asm-arm/arch-arc/param.h
  */

diff --git a/include/asm-arm/arch-cl7500/param.h b/include/asm-arm/arch-cl7500/param.h
index c2ae51097028fbf5615afc506e7e31017c0df165..974bf69fbb1a966b1ac1be5cf72d94a08ae0a206 100644 (file)
--- a/include/asm-arm/arch-cl7500/param.h
+++ b/include/asm-arm/arch-cl7500/param.h
@@ -1,7 +1,5 @@
 /*
- * linux/include/asm-arm/arch-cl7500/param.h
+ *  linux/include/asm-arm/arch-cl7500/param.h
  *
  * Copyright (C) 1999 Nexus Electronics Ltd
  */
-
-#define HZ 100

diff --git a/include/asm-arm/arch-clps711x/param.h b/include/asm-arm/arch-clps711x/param.h
index c46e69ad6071e2eebb1335698cc3cecfc9ab62f6..86f6bd29623d5cdb9a8c0dc4413fc4a0566f6b27 100644 (file)
--- a/include/asm-arm/arch-clps711x/param.h
+++ b/include/asm-arm/arch-clps711x/param.h
@@ -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

diff --git a/include/asm-arm/arch-ebsa110/param.h b/include/asm-arm/arch-ebsa110/param.h
index 3444dc74cda4d50a2be0f7009a67b84a54bb85b5..f077b717193df840b54c2cebd6064d8f291c53e6 100644 (file)
--- a/include/asm-arm/arch-ebsa110/param.h
+++ b/include/asm-arm/arch-ebsa110/param.h
@@ -1,3 +1,3 @@
 /*
- * linux/include/asm-arm/arch-ebsa110/param.h
+ *  linux/include/asm-arm/arch-ebsa110/param.h
  */

diff --git a/include/asm-arm/arch-ebsa285/param.h b/include/asm-arm/arch-ebsa285/param.h
index df5125b3b7b63eca0e5536d0682a3e9bfdac6bbd..3827103b27a0e8fd6337cf4ded54eb629a6426ad 100644 (file)
--- a/include/asm-arm/arch-ebsa285/param.h
+++ b/include/asm-arm/arch-ebsa285/param.h
@@ -1,3 +1,3 @@
 /*
- * linux/include/asm-arm/arch-ebsa285/param.h
+ *  linux/include/asm-arm/arch-ebsa285/param.h
  */

diff --git a/include/asm-arm/arch-epxa10db/param.h b/include/asm-arm/arch-epxa10db/param.h
index be8761708cc53f9cb23a6fead29aa645316ea79f..783dedd71c8fa2f30dfabd4cdf88a29f110a2864 100644 (file)
--- a/include/asm-arm/arch-epxa10db/param.h
+++ b/include/asm-arm/arch-epxa10db/param.h
@@ -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

diff --git a/include/asm-arm/arch-integrator/param.h b/include/asm-arm/arch-integrator/param.h
index b6f105d5e20f053332dc2b3c74ce0d33723de581..afa582ff3717c708ff911e2ab1ae211683b2035b 100644 (file)
--- a/include/asm-arm/arch-integrator/param.h
+++ b/include/asm-arm/arch-integrator/param.h
@@ -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

diff --git a/include/asm-arm/arch-iop310/param.h b/include/asm-arm/arch-iop310/param.h
index dded3a1de4e9823755d5029e5a46f267e3fb799c..56a1672f1f6d9924bcc6ed6ba8ca65640d7a5fdd 100644 (file)
--- a/include/asm-arm/arch-iop310/param.h
+++ b/include/asm-arm/arch-iop310/param.h
@@ -1,3 +1,3 @@
 /*
- * linux/include/asm-arm/arch-iop80310/param.h
+ *  linux/include/asm-arm/arch-iop80310/param.h
  */

diff --git a/include/asm-arm/arch-l7200/param.h b/include/asm-arm/arch-l7200/param.h
index 2bccb707a2f2c9904d719e408ffaa5ed2df278c2..98786ad712026427571175a229162132f8ec3a4f 100644 (file)
--- a/include/asm-arm/arch-l7200/param.h
+++ b/include/asm-arm/arch-l7200/param.h
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/arch-l7200/param.h
+ *  linux/include/asm-arm/arch-l7200/param.h
  *
  * Copyright (C) 2000 Rob Scott (rscott@mtrob.fdns.net)
  *                    Steve Hill (sjhill@cotw.com)
@@ -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

diff --git a/include/asm-arm/arch-nexuspci/param.h b/include/asm-arm/arch-nexuspci/param.h
index 68c37e8a5983d937e84e065a1f8c7f4eb338a715..d57753d8f1b8a30e4e3d84e1cd0312cb7253e72d 100644 (file)
--- a/include/asm-arm/arch-nexuspci/param.h
+++ b/include/asm-arm/arch-nexuspci/param.h
@@ -1,3 +1,3 @@
 /*
- * linux/include/asm-arm/arch-nexuspci/param.h
+ *  linux/include/asm-arm/arch-nexuspci/param.h
  */

diff --git a/include/asm-arm/arch-rpc/param.h b/include/asm-arm/arch-rpc/param.h
index 9156dff37c763a4886d49a90c36a43b2f245498b..721dcd658858d8b78dd1e5abc5fb7e9796b94300 100644 (file)
--- a/include/asm-arm/arch-rpc/param.h
+++ b/include/asm-arm/arch-rpc/param.h
@@ -1,3 +1,3 @@
 /*
- * linux/include/asm-arm/arch-rpc/param.h
+ *  linux/include/asm-arm/arch-rpc/param.h
  */

diff --git a/include/asm-arm/arch-sa1100/param.h b/include/asm-arm/arch-sa1100/param.h
index f0ea52b17da2fa308bf656b46d67833f0f11716e..867488909ecd3a6616ae01ca4a8cba782584bdae 100644 (file)
--- a/include/asm-arm/arch-sa1100/param.h
+++ b/include/asm-arm/arch-sa1100/param.h
@@ -1,3 +1,3 @@
 /*
- * linux/include/asm-arm/arch-sa1100/param.h
+ *  linux/include/asm-arm/arch-sa1100/param.h
  */

diff --git a/include/asm-arm/arch-shark/param.h b/include/asm-arm/arch-shark/param.h
index 3bb89b094e5bd3792c4590d71e69efe49c3bd5a0..997eeb71de003f1cd2059d133e05f98ccf92a0ab 100644 (file)
--- a/include/asm-arm/arch-shark/param.h
+++ b/include/asm-arm/arch-shark/param.h
@@ -1,8 +1,5 @@
 /*
- * linux/include/asm-arm/arch-shark/param.h
+ *  linux/include/asm-arm/arch-shark/param.h
  *
  * by Alexander Schulz
  */
-
-#define HZ 100
-

diff --git a/include/asm-arm/arch-tbox/param.h b/include/asm-arm/arch-tbox/param.h
index 5e9139c0e46bb8b5b1083c25b6420bb7cfcdd8c4..4b47fe32b7c640e523594eee0dc56841f43197e2 100644 (file)
--- a/include/asm-arm/arch-tbox/param.h
+++ b/include/asm-arm/arch-tbox/param.h
@@ -1 +1,4 @@
-#define HZ 1000
+/*
+ *  linux/include/asm-arm/arch-tbox/param.h
+ */
+#define __KERNEL_HZ 1000

diff --git a/include/asm-arm/param.h b/include/asm-arm/param.h
index 67af57ce2ec64052cf6e08815883910624baa85e..2bf8b1d793f6ad48fc7612c6e00bfd953e85f8c2 100644 (file)
--- a/include/asm-arm/param.h
+++ b/include/asm-arm/param.h
@@ -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