summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Jaeger <aj@suse.de>2000-10-02 08:51:41 +0000
committerAndreas Jaeger <aj@suse.de>2000-10-02 08:51:41 +0000
commit3f23079417f9fac1ddde03305214371319e0fb3a (patch)
treea451be531c633a572dd1bc9e91f6465619d1cbcc
parent5b6fb6bce41dce15c7152a3ffdeddc084b2a8f78 (diff)
Update.
2000-10-02 Andreas Jaeger <aj@suse.de> * sysdeps/unix/sysv/linux/alpha/bits/fcntl.h: Synch with Linux 2.4.0-test9-pre8. * sysdeps/unix/sysv/linux/alpha/bits/resource.h: Add RLIMIT_LOCKS.
-rw-r--r--ChangeLog7
-rw-r--r--sysdeps/unix/sysv/linux/alpha/bits/resource.h8
2 files changed, 13 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 365fda8e65..0d6697e5c7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2000-10-02 Andreas Jaeger <aj@suse.de>
+
+ * sysdeps/unix/sysv/linux/alpha/bits/fcntl.h: Synch with Linux
+ 2.4.0-test9-pre8.
+
+ * sysdeps/unix/sysv/linux/alpha/bits/resource.h: Add RLIMIT_LOCKS.
+
2000-10-01 Ralf Baechle <ralf@gnu.org>
* sysdeps/mips/dl-machine.h (RTLD_START): Fix computation of envp
diff --git a/sysdeps/unix/sysv/linux/alpha/bits/resource.h b/sysdeps/unix/sysv/linux/alpha/bits/resource.h
index c89f5a0639..a97c96c2ed 100644
--- a/sysdeps/unix/sysv/linux/alpha/bits/resource.h
+++ b/sysdeps/unix/sysv/linux/alpha/bits/resource.h
@@ -1,5 +1,5 @@
/* Bit values & structures for resource limits. Alpha/Linux version.
- Copyright (C) 1994, 1996, 1997, 1998, 1999 Free Software Foundation, Inc.
+ Copyright (C) 1994,96,97,98,99,2000 Free Software Foundation, Inc.
This file is part of the GNU C Library.
The GNU C Library is free software; you can redistribute it and/or
@@ -76,7 +76,11 @@ enum __rlimit_resource
RLIMIT_MEMLOCK = 9,
#define RLIMIT_MEMLOCK RLIMIT_MEMLOCK
- RLIM_NLIMITS = 10
+ /* Maximum number of file locks. */
+ RLIMIT_LOCKS = 10,
+#define RLIMIT_LOCKS RLIMIT_LOCKS
+
+ RLIM_NLIMITS = 11
#define RLIMIT_NLIMITS RLIMIT_NLIMITS
#define RLIM_NLIMITS RLIM_NLIMITS
};