34 lines
1.1 KiB
Diff
34 lines
1.1 KiB
Diff
Link:
|
|
Subject: fix mcst r1000 float cpuinfo, separate r1000 and sparc
|
|
Bug:
|
|
Tags: sparc
|
|
|
|
diff -rupN a/src/linux-common.c b/src/linux-common.c
|
|
--- a/src/linux-common.c 2020-11-27 05:25:45.814203203 +0300
|
|
+++ b/src/linux-common.c 2020-11-27 05:25:57.361386002 +0300
|
|
@@ -646,8 +646,11 @@ _linux_get_system_info( papi_mdi_t *mdi
|
|
/* Handle MHz */
|
|
|
|
retval = _linux_get_mhz( &sys_min_khz, &sys_max_khz );
|
|
+ #ifdef __r1000__
|
|
+ cpuinfo_mhz=1000; // mcst-r1000 has float CPU MHz in /proc/cpuinfo
|
|
+ #endif
|
|
if ( retval ) {
|
|
-
|
|
+
|
|
mdi->hw_info.cpu_max_mhz=cpuinfo_mhz;
|
|
mdi->hw_info.cpu_min_mhz=cpuinfo_mhz;
|
|
|
|
diff -rupN a/src/linux-memory.c b/src/linux-memory.c
|
|
--- a/src/linux-memory.c 2020-11-27 05:25:45.794208082 +0300
|
|
+++ b/src/linux-memory.c 2020-11-27 05:25:57.361386002 +0300
|
|
@@ -920,6 +920,8 @@ _linux_get_memory_info( PAPI_hw_info_t *
|
|
ia64_get_memory_info( hwinfo );
|
|
#elif defined(__powerpc__)
|
|
ppc64_get_memory_info( hwinfo );
|
|
+#elif defined(__r1000__) //mcst-r1000 __sparc__ defined
|
|
+ generic_get_memory_info (hwinfo);
|
|
#elif defined(__sparc__)
|
|
sparc_get_memory_info( hwinfo );
|
|
#elif defined(__arm__)
|