diff options
| author | Sam Ravnborg <sam@ravnborg.org> | 2008-06-06 15:02:38 -0400 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2008-07-18 00:42:07 -0400 |
| commit | 68a61c8d87dae7c7b7cc76ab01190475e87be0d9 (patch) | |
| tree | 41eb504d520300f8be61cdf3966abe88ec4b1e4e /include/asm-sparc | |
| parent | 7acc483d21a6e45e6ec8dc1eec711f7881bc3f3f (diff) | |
sparc: Merge asm-sparc{,64}/resource.h
RLIM_INFINITY differ from 32 and 64 bit.
The rest is equal.
:$ diff -u include/asm-sparc/resource.h include/asm-sparc64/resource.h
:-- include/asm-sparc/resource.h 2008-06-13 06:46:39.000000000 +0200
:++ include/asm-sparc64/resource.h 2008-06-13 06:46:39.000000000 +0200
:@@ -1,11 +1,11 @@
: /*
: * resource.h: Resource definitions.
: *
:- * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu)
:+ * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu)
: */
:
:-#ifndef _SPARC_RESOURCE_H
:-#define _SPARC_RESOURCE_H
:+#ifndef _SPARC64_RESOURCE_H
:+#define _SPARC64_RESOURCE_H
:
: /*
: * These two resource limit IDs have a Sparc/Linux-specific ordering,
:@@ -14,13 +14,6 @@
: #define RLIMIT_NOFILE 6 /* max number of open files */
: #define RLIMIT_NPROC 7 /* max number of processes */
:
:-/*
:- * SuS says limits have to be unsigned.
:- * We make this unsigned, but keep the
:- * old value for compatibility:
:- */
:-#define RLIM_INFINITY 0x7fffffff
:-
: #include <asm-generic/resource.h>
:
:-#endif /* !(_SPARC_RESOURCE_H) */
:+#endif /* !(_SPARC64_RESOURCE_H) */
Signed-off-by: Sam Ravnborg <sam@ravnborg.org>
Diffstat (limited to 'include/asm-sparc')
| -rw-r--r-- | include/asm-sparc/resource.h | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/include/asm-sparc/resource.h b/include/asm-sparc/resource.h index 985948a41299..fe163cafb4c7 100644 --- a/include/asm-sparc/resource.h +++ b/include/asm-sparc/resource.h | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | /* | 1 | /* |
| 2 | * resource.h: Resource definitions. | 2 | * resource.h: Resource definitions. |
| 3 | * | 3 | * |
| 4 | * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) | 4 | * Copyright (C) 1995,1996 David S. Miller (davem@caip.rutgers.edu) |
| 5 | */ | 5 | */ |
| 6 | 6 | ||
| 7 | #ifndef _SPARC_RESOURCE_H | 7 | #ifndef _SPARC_RESOURCE_H |
| @@ -14,12 +14,16 @@ | |||
| 14 | #define RLIMIT_NOFILE 6 /* max number of open files */ | 14 | #define RLIMIT_NOFILE 6 /* max number of open files */ |
| 15 | #define RLIMIT_NPROC 7 /* max number of processes */ | 15 | #define RLIMIT_NPROC 7 /* max number of processes */ |
| 16 | 16 | ||
| 17 | #if defined(__sparc__) && defined(__arch64__) | ||
| 18 | /* Use generic version */ | ||
| 19 | #else | ||
| 17 | /* | 20 | /* |
| 18 | * SuS says limits have to be unsigned. | 21 | * SuS says limits have to be unsigned. |
| 19 | * We make this unsigned, but keep the | 22 | * We make this unsigned, but keep the |
| 20 | * old value for compatibility: | 23 | * old value for compatibility: |
| 21 | */ | 24 | */ |
| 22 | #define RLIM_INFINITY 0x7fffffff | 25 | #define RLIM_INFINITY 0x7fffffff |
| 26 | #endif | ||
| 23 | 27 | ||
| 24 | #include <asm-generic/resource.h> | 28 | #include <asm-generic/resource.h> |
| 25 | 29 | ||