aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--resource/bits/types/struct_rusage.h5
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 4f0448c..888fcf4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2018-10-19 Florian Weimer <fweimer@redhat.com>
+
+ [BZ #23689]
+ * resource/bits/types/struct_rusage.h (struct rusage): Update
+ comment on struct. Remove extraneous field comment.
+
2018-10-18 David S. Miller <davem@davemloft.net>
* sysdeps/unix/sysv/linux/sparc/init-first.c: New file.
diff --git a/resource/bits/types/struct_rusage.h b/resource/bits/types/struct_rusage.h
index 5dc0916..5ff9429 100644
--- a/resource/bits/types/struct_rusage.h
+++ b/resource/bits/types/struct_rusage.h
@@ -22,7 +22,9 @@
#include <bits/types.h>
#include <bits/types/struct_timeval.h>
-/* Structure which says how much of each resource has been used. */
+/* Structure which says how much of each resource has been used. If
+ the system does not keep track of a particular value, the struct
+ field is always zero. */
/* The purpose of all the unions is to have the kernel-compatible layout
while keeping the API type as 'long int', and among machines where
@@ -42,7 +44,6 @@ struct rusage
};
/* Amount of sharing of text segment memory
with other processes (kilobyte-seconds). */
- /* Maximum resident set size (in kilobytes). */
__extension__ union
{
long int ru_ixrss;