rpms/procps/FC-6 procps-3.2.7-top-cpu0.patch, NONE, 1.1 procps.spec, 1.63, 1.64

[fedora-cvs-commits at redhat.com]

Author: tsmetana

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

Modified Files:
	procps.spec 
Added Files:
	procps-3.2.7-top-cpu0.patch 
Log Message:
* Mon Sep 17 2007 Tomas Smetana <tsmetana at redhat.com> 3.2.7-12
- fix #185994 - top "Cpu0" line never updates when using
  "Single Cpu = Off" option on single processor machine


procps-3.2.7-top-cpu0.patch:
 top.c |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

--- NEW FILE procps-3.2.7-top-cpu0.patch ---
--- procps-3.2.7/top.c.orig	2007-09-07 21:28:41.000000000 +0100
+++ procps-3.2.7/top.c	2007-09-07 21:29:15.000000000 +0100
@@ -959,8 +959,15 @@
 
    // 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;
+      cpus[0].z = cpus[1].z;
    }
 
    // now value each separate cpu's tics


Index: procps.spec
===================================================================
RCS file: /cvs/dist/rpms/procps/FC-6/procps.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- procps.spec	18 Jun 2007 10:52:03 -0000	1.63
+++ procps.spec	17 Sep 2007 07:19:23 -0000	1.64
@@ -1,7 +1,7 @@
 Summary: System and process monitoring utilities.
 Name: procps
 Version: 3.2.7
-Release: 11%{?dist}
+Release: 12%{?dist}
 License: GPL
 Group: Applications/System
 Source: http://procps.sourceforge.net/procps-%{version}.tar.gz
@@ -58,6 +58,8 @@
 Patch27: procps-3.2.7-ps-plussort.patch
 #244152 - ps truncates eip and esp to 32-bit values on 64-bit systems
 Patch28: procps-3.2.7-ps-eip64.patch
+#185994 - error when using "Single Cpu = Off" option
+Patch29: procps-3.2.7-top-cpu0.patch
 
 BuildRequires: ncurses-devel
 
@@ -111,6 +113,7 @@
 %patch26 -p1
 %patch27 -p1
 %patch28 -p1
+%patch29 -p1
 
 cp %SOURCE1 .
 
@@ -148,6 +151,10 @@
 %attr(0644,root,root) %{_mandir}/man5/*
 
 %changelog
+* Mon Sep 17 2007 Tomas Smetana <tsmetana at redhat.com> 3.2.7-12
+- fix #185994 - top "Cpu0" line never updates when using
+  "Single Cpu = Off" option on single processor machine
+
 * Mon Jun 18 2007 Tomas Smetana <tsmetana at redhat.com> 3.2.7-11
 - fix #244152 ps truncates eip and esp to 32-bit values on 64-bit systems