rpms/procps/F-7 procps-3.2.7-top-cpu0.patch, NONE, 1.1 procps.spec, 1.63, 1.64

[Tomas Smetana (tsmetana)]

Author: tsmetana

Update of /cvs/pkgs/rpms/procps/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24042

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


procps-3.2.7-top-cpu0.patch:

--- 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/pkgs/rpms/procps/F-7/procps.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- procps.spec	20 Aug 2007 13:03:01 -0000	1.63
+++ procps.spec	17 Sep 2007 07:08:04 -0000	1.64
@@ -1,7 +1,7 @@
 Summary: System and process monitoring utilities
 Name: procps
 Version: 3.2.7
-Release: 15%{?dist}
+Release: 16%{?dist}
 License: GPLv2+
 Group: Applications/System
 URL: http://procps.sourceforge.net
@@ -60,6 +60,8 @@
 Patch28: procps-3.2.7-ps-eip64.patch
 #244960 - ps manpage formatted incorrectly
 Patch29: procps-3.2.7-psman.patch
+#185994 - error when using "Single Cpu = Off" option
+Patch30: procps-3.2.7-top-cpu0.patch
 
 BuildRequires: ncurses-devel
 
@@ -114,6 +116,7 @@
 %patch27 -p1
 %patch28 -p1
 %patch29 -p1
+%patch30 -p1
 
 cp %SOURCE1 .
 
@@ -151,6 +154,10 @@
 %attr(0644,root,root) %{_mandir}/man5/*
 
 %changelog
+* Wed Sep 12 2007 Tomas Smetana <tsmetana at redhat.com> 3.2.7-16
+- fix #185994 - top "Cpu0" line never updates when using
+  "Single Cpu = Off" option on single processor machine
+
 * Mon Aug 20 2007 Tomas Smetana <tsmetana at redhat.com> 3.2.7-15
 - fix #244960 - ps manpage formatted incorrectly
 - update license tag