File perftest-s390.patch of Package perftest

Overview Repositories Revisions Requests Users Attributes Meta

File perftest-s390.patch of Package perftest

---
 src/get_clock.c |    6 +++---
 src/get_clock.h |    2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

Index: src/get_clock.c
===================================================================
--- src/get_clock.c.orig	2014-04-30 19:24:18.000000000 +0200
+++ src/get_clock.c	2014-05-16 21:19:20.961340704 +0200
@@ -132,7 +132,7 @@ static double sample_get_cpu_mhz(void)
 	return b;
 }
 
-#ifndef __s390x__
+#if !defined(__s390x__) && !defined(__s390__)
 static double proc_get_cpu_mhz(int no_cpu_freq_fail)
 {
 	FILE* f;
@@ -185,8 +185,8 @@ static double proc_get_cpu_mhz(int no_cp
 
 double get_cpu_mhz(int no_cpu_freq_fail)
 {
-#ifdef __s390x__
-	return sample_get_cpu_mgz();
+#if defined(__s390x__) || defined(__s390__)
+	return sample_get_cpu_mhz();
 #else
 	double sample, proc, delta;
 	sample = sample_get_cpu_mhz();
Index: src/get_clock.h
===================================================================
--- src/get_clock.h.orig	2014-04-30 19:24:18.000000000 +0200
+++ src/get_clock.h	2014-05-16 21:18:29.191335722 +0200
@@ -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(__s390x__) || defined(__s390__)
 typedef unsigned long long cycles_t;
 static inline cycles_t get_cycles(void)
 {

Places

File perftest-s390.patch of Package perftest

Places