diff --git a/procps-ng.spec b/procps-ng.spec index 3eb5499..634ff73 100644 --- a/procps-ng.spec +++ b/procps-ng.spec @@ -4,7 +4,7 @@ Summary: System and process monitoring utilities Name: procps-ng Version: 3.3.9 -Release: 8%{?dist} +Release: 9%{?dist} License: GPL+ and GPLv2 and GPLv2+ and GPLv3+ and LGPLv2+ Group: Applications/System URL: https://sourceforge.net/projects/procps-ng/ @@ -19,6 +19,7 @@ Patch4: vmstat-format-security.patch Patch5: subtract-shmem-from-cached.patch Patch6: sysctl-linelen-signed.patch Patch7: ps-man-tracing.patch +Patch8: revert-cached.patch Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig @@ -90,6 +91,7 @@ System and process monitoring utilities development headers %patch5 -p1 %patch6 -p1 %patch7 -p1 +%patch8 -p1 %build @@ -158,6 +160,9 @@ ln -s %{_bindir}/pidof %{buildroot}%{_sbindir}/pidof %{_includedir}/proc %changelog +* Wed Apr 30 2014 Jaromir Capik - 3.3.9-9 +- Dropping Cached -= Shmem (#963799) + * Tue Apr 08 2014 Jaromir Capik - 3.3.9-8 - Documenting the 't' process state code in the ps manual (#946864) diff --git a/revert-cached.patch b/revert-cached.patch new file mode 100644 index 0000000..dd4c2ee --- /dev/null +++ b/revert-cached.patch @@ -0,0 +1,42 @@ +diff --git a/free.1 b/free.1 +index 21cce28..85efef8 100644 +--- a/free.1 ++++ b/free.1 +@@ -32,9 +32,7 @@ kernels 2.6.32, displayed as zero if not available) + Memory used by kernel buffers (Buffers in /proc/meminfo) + .TP + \fBcached\fR +-Memory used by the page cache (calculated as Cached - Shmem in +-/proc/meminfo - the Cached value is actually the sum of page cache and +-tmpfs memory) ++Memory used by the page cache (Cached in /proc/meminfo) + .SH OPTIONS + .TP + \fB\-b\fR, \fB\-\-bytes\fR +diff --git a/proc/sysinfo.c b/proc/sysinfo.c +index e07ca86..85fb0a4 100644 +--- a/proc/sysinfo.c ++++ b/proc/sysinfo.c +@@ -682,8 +682,6 @@ nextline: + } + kb_swap_used = kb_swap_total - kb_swap_free; + kb_main_used = kb_main_total - kb_main_free; +- /* "Cached" includes "Shmem" - we want only the page cache here */ +- kb_main_cached -= kb_main_shared; + } + + /*****************************************************************/ +diff --git a/vmstat.8 b/vmstat.8 +index 2782a42..420d9f3 100644 +--- a/vmstat.8 ++++ b/vmstat.8 +@@ -102,8 +102,7 @@ b: The number of processes in uninterruptible sleep. + swpd: the amount of virtual memory used. + free: the amount of idle memory. + buff: the amount of memory used as buffers. +-cache: the amount of memory used as cache (excluding tmpfs memory for +-kernels 2.6.32+) ++cache: the amount of memory used as cache. + inact: the amount of inactive memory. (\-a option) + active: the amount of active memory. (\-a option) + .fi