rpms/pfmon/devel pfmon-ia64-checks1.patch, NONE, 1.1 pfmon.spec, 1.28, 1.29

[William Eden Cohen (wcohen)]

Author: wcohen

Update of /cvs/pkgs/rpms/pfmon/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv13643

Modified Files:
	pfmon.spec 
Added Files:
	pfmon-ia64-checks1.patch 
Log Message:
* Fri Apr 04 2008 Will Cohen <wcohen at redhat.com> - 3.3-0.080225.3
- Include patch to fix for ia64 fedora. rhbz #435048



pfmon-ia64-checks1.patch:

--- NEW FILE pfmon-ia64-checks1.patch ---
Index: pfmon/smpl_mod/dear_hist_ia64.c
===================================================================
RCS file: /cvsroot/perfmon2/pfmon/pfmon/smpl_mod/dear_hist_ia64.c,v
retrieving revision 1.12
retrieving revision 1.13
diff -U2 -u -r1.12 -r1.13
--- pfmon/smpl_mod/dear_hist_ia64.c	23 Jan 2008 00:37:05 -0000	1.12
+++ pfmon/smpl_mod/dear_hist_ia64.c	27 Feb 2008 23:28:08 -0000	1.13
@@ -187,5 +187,5 @@
 	unsigned int l2_latency, l3_latency;
 	size_t	sample_size;
-	void *hash_desc = csmpl->data, *data;
+	void *hash_desc, *data;
 	void *pos;
 	hash_data_t *hash_entry;
@@ -198,4 +198,8 @@
 	hdr   = csmpl->smpl_hdr;
 
+	if (hdr == NULL)
+		return -1;
+
+        hash_desc   = csmpl->data;
 	pos	    = hdr+1;
 	entry       = options.opt_aggr ? *csmpl->aggr_count : csmpl->entry_count;
Index: pfmon/smpl_mod/dear_hist_ia64_old_smpl.c
===================================================================
RCS file: /cvsroot/perfmon2/pfmon/pfmon/smpl_mod/dear_hist_ia64_old_smpl.c,v
retrieving revision 1.10
retrieving revision 1.11
diff -U2 -u -r1.10 -r1.11
--- pfmon/smpl_mod/dear_hist_ia64_old_smpl.c	23 Jan 2008 00:37:05 -0000	1.10
+++ pfmon/smpl_mod/dear_hist_ia64_old_smpl.c	27 Feb 2008 23:28:08 -0000	1.11
@@ -199,4 +199,8 @@
 	csmpl = &sdesc->csmpl;
 	hdr   = csmpl->smpl_hdr;
+
+	if (hdr == NULL)
+		return -1;
+
 	hash_desc = csmpl->data;
 


Index: pfmon.spec
===================================================================
RCS file: /cvs/pkgs/rpms/pfmon/devel/pfmon.spec,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -r1.28 -r1.29
--- pfmon.spec	5 Apr 2008 02:46:35 -0000	1.28
+++ pfmon.spec	5 Apr 2008 02:53:04 -0000	1.29
@@ -1,5 +1,5 @@
 %define DATE 080225
-%define pfmon_release 2
+%define pfmon_release 3
 Summary: A performance monitoring tool for Linux/ia64
 Name: pfmon
 Version: 3.3
@@ -62,6 +62,9 @@
 %attr(755,root,root) /usr/bin/pfmon_gen
 
 %changelog
+* Fri Apr 04 2008 Will Cohen <wcohen at redhat.com> - 3.3-0.080225.3
+- Include patch to fix for ia64 fedora. rhbz #435048
+
 * Fri Apr 04 2008 Will Cohen <wcohen at redhat.com> - 3.3-0.080225.2
 - Fix for ia64 fedora. rhbz #435048