diff --git a/[refs] b/[refs]
index 59ed00addf70..4dc68f1b33c0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6486cda6c6b15368e2c925d89b4e9ed13e67b91b
+refs/heads/master: f5cae7b0fb6927981a839443dfa6d73c30415cba
diff --git a/trunk/arch/s390/include/asm/param.h b/trunk/arch/s390/include/asm/param.h
index 34aaa4603347..c616821bf2ac 100644
--- a/trunk/arch/s390/include/asm/param.h
+++ b/trunk/arch/s390/include/asm/param.h
@@ -1,30 +1,6 @@
-/*
- *  include/asm-s390/param.h
- *
- *  S390 version
- *
- *  Derived from "include/asm-i386/param.h"
- */
-
 #ifndef _ASMS390_PARAM_H
 #define _ASMS390_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	4096
-
-#ifndef NOGROUP
-#define NOGROUP		(-1)
-#endif
-
-#define MAXHOSTNAMELEN	64	/* max length of hostname */
+#include <asm-generic/param.h>
 
-#endif
+#endif /* _ASMS390_PARAM_H */