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@xxxxxxxxxxxxxxxx) + * Copyright (C) 1996 David S. Miller (davem@xxxxxxxxxxxxxxxx) */ -#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@xxxxxxxxxxxx> --- include/asm-sparc/resource.h | 6 +++++- include/asm-sparc64/resource.h | 20 +------------------- 2 files changed, 6 insertions(+), 20 deletions(-) diff --git a/include/asm-sparc/resource.h b/include/asm-sparc/resource.h index 985948a..fe163ca 100644 --- a/include/asm-sparc/resource.h +++ b/include/asm-sparc/resource.h @@ -1,7 +1,7 @@ /* * resource.h: Resource definitions. * - * Copyright (C) 1995 David S. Miller (davem@xxxxxxxxxxxxxxxx) + * Copyright (C) 1995,1996 David S. Miller (davem@xxxxxxxxxxxxxxxx) */ #ifndef _SPARC_RESOURCE_H @@ -14,12 +14,16 @@ #define RLIMIT_NOFILE 6 /* max number of open files */ #define RLIMIT_NPROC 7 /* max number of processes */ +#if defined(__sparc__) && defined(__arch64__) +/* Use generic version */ +#else /* * SuS says limits have to be unsigned. * We make this unsigned, but keep the * old value for compatibility: */ #define RLIM_INFINITY 0x7fffffff +#endif #include <asm-generic/resource.h> diff --git a/include/asm-sparc64/resource.h b/include/asm-sparc64/resource.h index 4f08fb5..46e3bc0 100644 --- a/include/asm-sparc64/resource.h +++ b/include/asm-sparc64/resource.h @@ -1,19 +1 @@ -/* - * resource.h: Resource definitions. - * - * Copyright (C) 1996 David S. Miller (davem@xxxxxxxxxxxxxxxx) - */ - -#ifndef _SPARC64_RESOURCE_H -#define _SPARC64_RESOURCE_H - -/* - * These two resource limit IDs have a Sparc/Linux-specific ordering, - * the rest comes from the generic header: - */ -#define RLIMIT_NOFILE 6 /* max number of open files */ -#define RLIMIT_NPROC 7 /* max number of processes */ - -#include <asm-generic/resource.h> - -#endif /* !(_SPARC64_RESOURCE_H) */ +#include <asm-sparc/resource.h> -- 1.5.4.1.143.ge7e51 -- To unsubscribe from this list: send the line "unsubscribe sparclinux" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
