From b1c1ebaaa3f98c3aa554a881099ded5af20eeb6f Mon Sep 17 00:00:00 2001 From: Sam Ravnborg Date: Fri, 6 Jun 2008 21:02:38 +0200 Subject: [PATCH] --- yaml --- r: 104158 b: refs/heads/master c: 68a61c8d87dae7c7b7cc76ab01190475e87be0d9 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/include/asm-sparc/resource.h | 6 +++++- trunk/include/asm-sparc64/resource.h | 20 +------------------- 3 files changed, 7 insertions(+), 21 deletions(-) diff --git a/[refs] b/[refs] index 6734a7ef27b0..e5323dce5ed3 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 7acc483d21a6e45e6ec8dc1eec711f7881bc3f3f +refs/heads/master: 68a61c8d87dae7c7b7cc76ab01190475e87be0d9 diff --git a/trunk/include/asm-sparc/resource.h b/trunk/include/asm-sparc/resource.h index 985948a41299..fe163cafb4c7 100644 --- a/trunk/include/asm-sparc/resource.h +++ b/trunk/include/asm-sparc/resource.h @@ -1,7 +1,7 @@ /* * resource.h: Resource definitions. * - * Copyright (C) 1995 David S. Miller (davem@caip.rutgers.edu) + * Copyright (C) 1995,1996 David S. Miller (davem@caip.rutgers.edu) */ #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 diff --git a/trunk/include/asm-sparc64/resource.h b/trunk/include/asm-sparc64/resource.h index 4f08fb5e4ca4..46e3bc0de476 100644 --- a/trunk/include/asm-sparc64/resource.h +++ b/trunk/include/asm-sparc64/resource.h @@ -1,19 +1 @@ -/* - * resource.h: Resource definitions. - * - * Copyright (C) 1996 David S. Miller (davem@caip.rutgers.edu) - */ - -#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 - -#endif /* !(_SPARC64_RESOURCE_H) */ +#include