• Sam Ravnborg's avatar
    sparc: Merge asm-sparc{,64}/resource.h · 68a61c8d
    Sam Ravnborg authored
    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: default avatarSam Ravnborg <sam@ravnborg.org>
    68a61c8d
resource.h 32 Bytes