rpms/procps/FC-4 procps-3.2.5-top-cpu0.patch, NONE, 1.1 procps.spec, 1.40, 1.41

[fedora-cvs-commits at redhat.com]

Author: kzak

Update of /cvs/dist/rpms/procps/FC-4
In directory cvs.devel.redhat.com:/tmp/cvs-serv16834

Modified Files:
	procps.spec 
Added Files:
	procps-3.2.5-top-cpu0.patch 
Log Message:
fix cpu0 line in top

procps-3.2.5-top-cpu0.patch:
 top.c |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

--- NEW FILE procps-3.2.5-top-cpu0.patch ---
--- procps-3.2.5/top.c.cpu0	2006-06-01 13:06:46.000000000 +0200
+++ procps-3.2.5/top.c	2006-06-01 13:08:35.000000000 +0200
@@ -946,8 +946,14 @@
 
    // and just in case we're 2.2.xx compiled without SMP support...
    if (Cpu_tot == 1) {
-      cpus[1].id = 0;
-      memcpy(cpus, &cpus[1], sizeof(CPU_t));
+      cpus[0].id = cpus[1].id = 0;
+      cpus[0].u = cpus[1].u;
+      cpus[0].n = cpus[1].n;
+      cpus[0].s = cpus[1].s;
+      cpus[0].i = cpus[1].i;
+      cpus[0].w = cpus[1].w;
+      cpus[0].x = cpus[1].x;
+      cpus[0].y = cpus[1].y;
    }
 
    // now value each separate cpu's tics


Index: procps.spec
===================================================================
RCS file: /cvs/dist/rpms/procps/FC-4/procps.spec,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- procps.spec	11 Jul 2005 08:06:41 -0000	1.40
+++ procps.spec	1 Jun 2006 11:23:33 -0000	1.41
@@ -1,7 +1,7 @@
 Summary: System and process monitoring utilities.
 Name: procps
 Version: 3.2.5
-Release: 6.3
+Release: 6.4
 License: GPL
 Group: Applications/System
 Source: http://procps.sourceforge.net/procps-%{version}.tar.gz
@@ -24,6 +24,8 @@
 Patch11: procps-3.2.5-top-sigwinch.patch
 # 160796 - vmstat crashes when accessing LVM partition.
 Patch12: procps-3.2.5-vmstat-parg.patch
+# 185994 - Top "Cpu0" line never updates on single processor machine
+Patch13: procps-3.2.5-top-cpu0.patch
 
 BuildRequires: ncurses-devel
 
@@ -63,6 +65,7 @@
 %patch10 -p1 -b .rc
 %patch11 -p1 -b .sigwinch
 %patch12 -p1 -b .parg
+%patch13 -p1 -b .cpu0
 
 cp %SOURCE1 .
 
@@ -100,6 +103,9 @@
 %attr(0644,root,root) %{_mandir}/man5/*
 
 %changelog
+* Thu Jun  1 2006 Karel Zak <kzak at redhat.com> 3.2.5-6.4
+- fix #185994 - top "Cpu0" line never updates on single processor machine
+
 * Mon Jul 11 2005 Karel Zak <kzak at redhat.com> 3.2.5-6.3
 - imporoved procps-3.2.5-sysctl-writeonly.patch