Merge branches 'x86/alternatives', 'x86/cleanups', 'x86/commandline', 'x86/crashdump...

[cascardo/linux.git] / include / asm-x86 / param.h

diff --git a/include/asm-x86/param.h b/include/asm-x86/param.h
index 640851b..0009cfb 100644 (file)
--- a/include/asm-x86/param.h
+++ b/include/asm-x86/param.h
@@ -1,13 +1,22 @@
+#ifndef ASM_X86__PARAM_H
+#define ASM_X86__PARAM_H
+
 #ifdef __KERNEL__
-# ifdef CONFIG_X86_32
-#  include "param_32.h"
-# else
-#  include "param_64.h"
-# endif
-#else
-# ifdef __i386__
-#  include "param_32.h"
-# else
-#  include "param_64.h"
-# endif
+# define HZ            CONFIG_HZ       /* Internal kernel timer frequency */
+# define USER_HZ       100             /* some user interfaces are */
+# define CLOCKS_PER_SEC        (USER_HZ)       /* in "ticks" 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 */
+
+#endif /* ASM_X86__PARAM_H */