6 files changed, 15 insertions, 4 deletions
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