]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
sparc: Merge asm-sparc{,64}/resource.h
authorSam Ravnborg <sam@ravnborg.org>
Fri, 6 Jun 2008 19:02:38 +0000 (21:02 +0200)
committerDavid S. Miller <davem@davemloft.net>
Fri, 18 Jul 2008 04:42:07 +0000 (21:42 -0700)
commit68a61c8d87dae7c7b7cc76ab01190475e87be0d9
tree41eb504d520300f8be61cdf3966abe88ec4b1e4e
parent7acc483d21a6e45e6ec8dc1eec711f7881bc3f3f
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>
include/asm-sparc/resource.h
include/asm-sparc64/resource.h