From 5837d887db9d5ec622566642cdeb3d399d935078 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Nov 19 2015 15:59:51 +0000
Subject: import perftest-2.4-1.el7


---

diff --git a/.gitignore b/.gitignore
index 95b05e4..7c2ed54 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/perftest-2.3-0.12.gcb5b746.tar.gz
+SOURCES/perftest-2.4-0.8.gd3c2b22.tar.gz
diff --git a/.perftest.metadata b/.perftest.metadata
index 9179ca5..ee2f981 100644
--- a/.perftest.metadata
+++ b/.perftest.metadata
@@ -1 +1 @@
-df45dea76f49c7f35deaad531f7bc826906ede0b SOURCES/perftest-2.3-0.12.gcb5b746.tar.gz
+e00843a4147055238797a267d59ac4d14be3f074 SOURCES/perftest-2.4-0.8.gd3c2b22.tar.gz
diff --git a/SOURCES/perftest-enable-s390x-platform-support.patch b/SOURCES/perftest-enable-s390x-platform-support.patch
new file mode 100644
index 0000000..6576a5c
--- /dev/null
+++ b/SOURCES/perftest-enable-s390x-platform-support.patch
@@ -0,0 +1,68 @@
+From https://bugzilla.redhat.com/show_bug.cgi?id=1182177#c5
+
+Enable the s390x plaform support in the perftest-2.3.1 package by fixing
+a typo in the sample_get_cpu_mhz() function call and a couple of typos in
+the README file.
+
+Signed-off-by: Alexey Ishchuk <aishchuk@linux.vnet.ibm.com>
+
+[ Rebased and modified to check for __s390__, to cover
+  both s390 and s390x. -- mschmidt]
+---
+ README          | 2 +-
+ src/get_clock.c | 6 +++---
+ src/get_clock.h | 2 +-
+ 3 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/README b/README
+index 3eb2eda67d..f2c7c3feeb 100644
+--- a/README
++++ b/README
+@@ -237,7 +237,7 @@ Special feature detailed explanation in tests:
+     ./configure --disable-verbs_exp
+     make
+ 
+- 6. In te x390x platform virtualized environment the results shown by package test applications can be incorrect.
++ 6. In the s390x platform virtualized environment the results shown by package test applications can be incorrect.
+ 
+  7. perftest-2.3 release includes support for dualport VPI test - port1-Ethernet , port2-IB. (in addition to Eth:Eth, IB:IB)
+     Currently, running dualport when port1-IB , port2-Ethernet still not working.
+diff --git a/src/get_clock.c b/src/get_clock.c
+index e6a78eac95..e6c3c14005 100755
+--- a/src/get_clock.c
++++ b/src/get_clock.c
+@@ -133,7 +133,7 @@ static double sample_get_cpu_mhz(void)
+ 	return b;
+ }
+ 
+-#ifndef __s390x__
++#ifndef __s390__
+ static double proc_get_cpu_mhz(int no_cpu_freq_fail)
+ {
+ 	FILE* f;
+@@ -205,8 +205,8 @@ static double proc_get_cpu_mhz(int no_cpu_freq_fail)
+ 
+ double get_cpu_mhz(int no_cpu_freq_fail)
+ {
+-	#ifdef __s390x__
+-	return sample_get_cpu_mgz();
++	#ifdef __s390__
++	return sample_get_cpu_mhz();
+ 	#else
+ 	double sample, proc, delta;
+ 	sample = sample_get_cpu_mhz();
+diff --git a/src/get_clock.h b/src/get_clock.h
+index c0f1cfc0a7..b9a750ff3d 100755
+--- a/src/get_clock.h
++++ b/src/get_clock.h
+@@ -70,7 +70,7 @@ static inline cycles_t get_cycles()
+ 	asm volatile ("mov %0=ar.itc" : "=r" (ret));
+ 	return ret;
+ }
+-#elif defined(__s390x__)
++#elif defined(__s390__)
+ typedef unsigned long long cycles_t;
+ static inline cycles_t get_cycles(void)
+ {
+-- 
+2.4.3
diff --git a/SPECS/perftest.spec b/SPECS/perftest.spec
index 42a1209..645ff40 100644
--- a/SPECS/perftest.spec
+++ b/SPECS/perftest.spec
@@ -1,18 +1,18 @@
 Name:		perftest
 Summary:	IB Performance Tests
-Version:	2.3
+Version:	2.4
 Release:	1%{?dist}
 License:	GPLv2 or BSD
 Group:		Productivity/Networking/Diagnostic
-Source:		http://www.openfabrics.org/downloads/%{name}/%{name}-%{version}-0.12.gcb5b746.tar.gz
+Source:		https://www.openfabrics.org/downloads/%{name}/%{name}-%{version}-0.8.gd3c2b22.tar.gz
 Patch0:		perftest-2.0-cflags.patch
+Patch1:		perftest-enable-s390x-platform-support.patch
 Url:		http://www.openfabrics.org
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libibverbs-devel > 1.1.4, librdmacm-devel > 1.0.14
 BuildRequires:	libibumad-devel > 1.3.6
 BuildRequires:	autoconf, automake, libtool
 Obsoletes:	openib-perftest < 1.3
-ExcludeArch:	s390 s390x
 
 %description
 Perftest is a collection of simple test programs designed to utilize 
@@ -23,6 +23,7 @@ RDMA networks.
 %prep
 %setup -q
 %patch0 -p1 -b .cflags
+%patch1 -p1
 autoreconf --force --install
 
 %build
@@ -41,6 +42,11 @@ done
 %_bindir/*
 
 %changelog
+* Tue Jun 16 2015 Michal Schmidt <mschmidt@redhat.com> - 2.4-1
+- Update to latest upstream release
+- Enable s390x platform
+- Resolves: bz1182177
+
 * Fri Oct 17 2014 Doug Ledford <dledford@redhat.com> - 2.3-1
 - Update to latest upstream release
 - Resolves: bz1061582