aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAurelien Jarno <aurelien@aurel32.net>2014-05-16 00:04:41 +0200
committerAurelien Jarno <aurelien@aurel32.net>2014-05-16 00:14:22 +0200
commitd56700df46977b14e9fe54201132fed04475cd03 (patch)
treea91dc2e00e09a5a25a282450eceddc8b75b67bbe
parent3ce4555d432282fcfe963cc8809163e85ee0f71c (diff)
downloadtermbaud-d56700df46977b14e9fe54201132fed04475cd03.tar.gz
termbaud-d56700df46977b14e9fe54201132fed04475cd03.tar.xz
termbaud-d56700df46977b14e9fe54201132fed04475cd03.zip
SPARC: add prlimit and prlimit64 in <bits/resource.h> (BZ #16943)
prlimit and prlimit64 have been added in the main <bits/resource.h>, but not in the SPARC specific version. Fix that. Note: this is Debian bug#703559, reported by Emilio Pozuelo Monfort <pochu@debian.org> (cherry picked from commit d16e6ec7ca2c861ba681e3a2fbd431725774292e)
-rw-r--r--ChangeLog6
-rw-r--r--NEWS3
-rw-r--r--sysdeps/unix/sysv/linux/sparc/bits/resource.h27
3 files changed, 35 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 961f0dd40ce..f008fb468df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-05-16 Aurelien Jarno <aurelien@aurel32.net>
+
+ [BZ #16943]
+ * sysdeps/unix/sysv/linux/sparc/bits/resource.h: Declare prlimit
+ and prlimit64.
+
2014-05-06 Aurelien Jarno <aurelien@aurel32.net>
[BZ# 16916]
diff --git a/NEWS b/NEWS
index 93175e17922..482561767f4 100644
--- a/NEWS
+++ b/NEWS
@@ -9,7 +9,8 @@ Version 2.18.1
* The following bugs are resolved with this release:
- 15073, 15128, 15909, 15996, 16150, 16169, 16387, 16510, 16885, 16916.
+ 15073, 15128, 15909, 15996, 16150, 16169, 16387, 16510, 16885, 16916,
+ 16943.
Version 2.18
diff --git a/sysdeps/unix/sysv/linux/sparc/bits/resource.h b/sysdeps/unix/sysv/linux/sparc/bits/resource.h
index 14c2b70ad38..cee1c0fe886 100644
--- a/sysdeps/unix/sysv/linux/sparc/bits/resource.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/resource.h
@@ -252,3 +252,30 @@ enum __priority_which
PRIO_USER = 2 /* WHO is a user ID. */
#define PRIO_USER PRIO_USER
};
+
+__BEGIN_DECLS
+
+#ifdef __USE_GNU
+/* Modify and return resource limits of a process atomically. */
+# ifndef __USE_FILE_OFFSET64
+extern int prlimit (__pid_t __pid, enum __rlimit_resource __resource,
+ const struct rlimit *__new_limit,
+ struct rlimit *__old_limit) __THROW;
+# else
+# ifdef __REDIRECT_NTH
+extern int __REDIRECT_NTH (prlimit, (__pid_t __pid,
+ enum __rlimit_resource __resource,
+ const struct rlimit *__new_limit,
+ struct rlimit *__old_limit), prlimit64);
+# else
+# define prlimit prlimit64
+# endif
+# endif
+# ifdef __USE_LARGEFILE64
+extern int prlimit64 (__pid_t __pid, enum __rlimit_resource __resource,
+ const struct rlimit64 *__new_limit,
+ struct rlimit64 *__old_limit) __THROW;
+# endif
+#endif
+
+__END_DECLS