Some cleaning of the support for machines with HZ other than a

architecture specific standard value.  Not entirely at the point
where we can send this to Linus.

16 files changed, 40 insertions, 4 deletions

diff --git a/include/asm-alpha/param.h b/include/asm-alpha/param.h
index 987879760..749ff7ba8 100644
--- a/include/asm-alpha/param.h
+++ b/include/asm-alpha/param.h
@@ -13,8 +13,10 @@
 # else
 #  define HZ	1200
 # endif
+#ifdef __KERNEL__
 # define HZ_TO_STD(a) (a)
 #endif
+#endif
 
 #define EXEC_PAGESIZE	8192
 
diff --git a/include/asm-arm/arch-ebsa110/param.h b/include/asm-arm/arch-ebsa110/param.h
index 1dcb668bf..3444dc74c 100644
--- a/include/asm-arm/arch-ebsa110/param.h
+++ b/include/asm-arm/arch-ebsa110/param.h
@@ -1,4 +1,3 @@
 /*
  * linux/include/asm-arm/arch-ebsa110/param.h
  */
-#define HZ_TO_STD(a) (a)
diff --git a/include/asm-arm/arch-ebsa285/param.h b/include/asm-arm/arch-ebsa285/param.h
index 29c931cc6..df5125b3b 100644
--- a/include/asm-arm/arch-ebsa285/param.h
+++ b/include/asm-arm/arch-ebsa285/param.h
@@ -1,4 +1,3 @@
 /*
  * linux/include/asm-arm/arch-ebsa285/param.h
  */
-#define HZ_TO_STD(a) (a)
diff --git a/include/asm-arm/arch-nexuspci/param.h b/include/asm-arm/arch-nexuspci/param.h
index fb1354008..68c37e8a5 100644
--- a/include/asm-arm/arch-nexuspci/param.h
+++ b/include/asm-arm/arch-nexuspci/param.h
@@ -1,4 +1,3 @@
 /*
  * linux/include/asm-arm/arch-nexuspci/param.h
  */
-#define HZ_TO_STD(a) (a)
diff --git a/include/asm-arm/arch-rpc/param.h b/include/asm-arm/arch-rpc/param.h
index 4ac90b86b..9156dff37 100644
--- a/include/asm-arm/arch-rpc/param.h
+++ b/include/asm-arm/arch-rpc/param.h
@@ -1,4 +1,3 @@
 /*
  * linux/include/asm-arm/arch-rpc/param.h
  */
-#define HZ_TO_STD(a) (a)
diff --git a/include/asm-arm/arch-shark/param.h b/include/asm-arm/arch-shark/param.h
index f6b5f9e71..fe1c437b8 100644
--- a/include/asm-arm/arch-shark/param.h
+++ b/include/asm-arm/arch-shark/param.h
@@ -8,3 +8,15 @@
  * can't use anything else.
  */
 #define HZ 64
+#ifdef __KERNEL__
+/* Conceptually
+
+     #define HZ_TO_STD(a) ((a) * 100 / HZ)
+
+   is what has to be done, it just has overflow problems with the
+   intermediate result of the multiply after a bit more than 7 days.
+   See include/asm-mips/param.h for a optized sample implementation
+   used on DECstations.
+ */
+#error Provide a definiton for HZ_TO_STD
+#endif
diff --git a/include/asm-arm/param.h b/include/asm-arm/param.h
index b0bf058ec..9840d4b4a 100644
--- a/include/asm-arm/param.h
+++ b/include/asm-arm/param.h
@@ -12,6 +12,9 @@
 #ifndef HZ
 #define HZ 100
 #endif
+#if defined(__KERNEL__) && (HZ == 100)
+#define HZ_TO_STD(a) (a)
+#endif
 
 #ifndef NGROUPS
 #define NGROUPS         32
diff --git a/include/asm-i386/param.h b/include/asm-i386/param.h
index 8477d5c7a..ae7824921 100644
--- a/include/asm-i386/param.h
+++ b/include/asm-i386/param.h
@@ -3,8 +3,10 @@
 
 #ifndef HZ
 #define HZ 100
+#ifdef __KERNEL__
 #define HZ_TO_STD(a) (a)
 #endif
+#endif
 
 #define EXEC_PAGESIZE	4096
 
diff --git a/include/asm-ia64/param.h b/include/asm-ia64/param.h
index e93d4756a..2ab10770a 100644
--- a/include/asm-ia64/param.h
+++ b/include/asm-ia64/param.h
@@ -30,6 +30,10 @@
 # define HZ	1024
 #endif
 
+#ifdef __KERNEL__
+#define HZ_TO_STD(a) (a)
+#endif
+
 #define EXEC_PAGESIZE	65536
 
 #ifndef NGROUPS
diff --git a/include/asm-m68k/param.h b/include/asm-m68k/param.h
index 4b11fdf97..6ce91970d 100644
--- a/include/asm-m68k/param.h
+++ b/include/asm-m68k/param.h
@@ -5,8 +5,10 @@
 
 #ifndef HZ
 #define HZ 100
+#ifdef __KERNEL__
 #define HZ_TO_STD(a) (a)
 #endif
+#endif
 
 #ifndef CONFIG_SUN3
 #define EXEC_PAGESIZE	4096
diff --git a/include/asm-mips64/param.h b/include/asm-mips64/param.h
index 981baa1d7..f958c4d8a 100644
--- a/include/asm-mips64/param.h
+++ b/include/asm-mips64/param.h
@@ -12,8 +12,10 @@
 #ifndef HZ
 #define HZ 100
 #  define HZ 100
+#ifdef __KERNEL__
 #  define HZ_TO_STD(a) (a)
 #endif
+#endif
 
 #define EXEC_PAGESIZE	4096
 
diff --git a/include/asm-ppc/param.h b/include/asm-ppc/param.h
index 35ad254d6..fef4beb74 100644
--- a/include/asm-ppc/param.h
+++ b/include/asm-ppc/param.h
@@ -3,8 +3,10 @@
 
 #ifndef HZ
 #define HZ 100
+#ifdef __KERNEL__
 #define HZ_TO_STD(a) (a)
 #endif
+#endif
 
 #define EXEC_PAGESIZE	4096
 
diff --git a/include/asm-s390/param.h b/include/asm-s390/param.h
index 147daa647..1ee5d2518 100644
--- a/include/asm-s390/param.h
+++ b/include/asm-s390/param.h
@@ -11,6 +11,9 @@
 
 #ifndef HZ
 #define HZ 100
+#ifdef __KERNEL__
+#define HZ_TO_STD(a) (a)
+#endif
 #endif
 
 #define EXEC_PAGESIZE	4096
diff --git a/include/asm-sh/param.h b/include/asm-sh/param.h
index 5ff8b6fdf..f347bacd9 100644
--- a/include/asm-sh/param.h
+++ b/include/asm-sh/param.h
@@ -3,6 +3,9 @@
 
 #ifndef HZ
 #define HZ 100
+#ifdef __KERNEL__
+#define HZ_TO_STD(a) (a)
+#endif
 #endif
 
 #define EXEC_PAGESIZE	4096
diff --git a/include/asm-sparc/param.h b/include/asm-sparc/param.h
index 7e14a410e..7e346d366 100644
--- a/include/asm-sparc/param.h
+++ b/include/asm-sparc/param.h
@@ -4,6 +4,9 @@
 
 #ifndef HZ
 #define HZ 100
+#ifdef __KERNEL__
+#define HZ_TO_STD(a) (a)
+#endif
 #endif
 
 #define EXEC_PAGESIZE	8192    /* Thanks for sun4's we carry baggage... */
diff --git a/include/asm-sparc64/param.h b/include/asm-sparc64/param.h
index 457db4933..bfaec7ba3 100644
--- a/include/asm-sparc64/param.h
+++ b/include/asm-sparc64/param.h
@@ -4,8 +4,10 @@
 
 #ifndef HZ
 #define HZ 100
+#ifdef __KERNEL__
 #define HZ_TO_STD(a) (a)
 #endif
+#endif
 
 #define EXEC_PAGESIZE	8192    /* Thanks for sun4's we carry baggage... */