diff options
author | Sam Ravnborg <sam@ravnborg.org> | 2008-06-05 17:07:26 -0400 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2008-07-18 00:41:20 -0400 |
commit | 4835bd988e58150c0a6e2d3e13e319a56ed821dc (patch) | |
tree | 234cfa19414237c5574b7279dd267295a2584f9b | |
parent | f1ba03cac28edc4d68cca2475d50f463afcd2955 (diff) |
sparc: Merge asm-sparc{,64}/param.h
:$ diff -u include/asm-sparc/param.h include/asm-sparc64/param.h
:-- include/asm-sparc/param.h 2008-06-13 06:46:39.000000000 +0200
:++ include/asm-sparc64/param.h 2008-06-13 06:42:07.000000000 +0200
:@@ -1,5 +1,6 @@
:-#ifndef _ASMSPARC_PARAM_H
:-#define _ASMSPARC_PARAM_H
:+#ifndef _ASMSPARC64_PARAM_H
:+#define _ASMSPARC64_PARAM_H
:+
:
: #ifdef __KERNEL__
: # define HZ CONFIG_HZ /* Internal kernel timer frequency */
:@@ -19,4 +20,4 @@
:
: #define MAXHOSTNAMELEN 64 /* max length of hostname */
:
:-#endif
:+#endif /* _ASMSPARC64_PARAM_H */
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
-rw-r--r-- | include/asm-sparc64/param.h | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/include/asm-sparc64/param.h b/include/asm-sparc64/param.h index f0125cf5a9df..40c6dc110822 100644 --- a/include/asm-sparc64/param.h +++ b/include/asm-sparc64/param.h | |||
@@ -1,23 +1 @@ | |||
1 | #ifndef _ASMSPARC64_PARAM_H | #include <asm-sparc/param.h> | |
2 | #define _ASMSPARC64_PARAM_H | ||
3 | |||
4 | |||
5 | #ifdef __KERNEL__ | ||
6 | # define HZ CONFIG_HZ /* Internal kernel timer frequency */ | ||
7 | # define USER_HZ 100 /* .. some user interfaces are in "ticks" */ | ||
8 | # define CLOCKS_PER_SEC (USER_HZ) | ||
9 | #endif | ||
10 | |||
11 | #ifndef HZ | ||
12 | #define HZ 100 | ||
13 | #endif | ||
14 | |||
15 | #define EXEC_PAGESIZE 8192 /* Thanks for sun4's we carry baggage... */ | ||
16 | |||
17 | #ifndef NOGROUP | ||
18 | #define NOGROUP (-1) | ||
19 | #endif | ||
20 | |||
21 | #define MAXHOSTNAMELEN 64 /* max length of hostname */ | ||
22 | |||
23 | #endif /* _ASMSPARC64_PARAM_H */ | ||