You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
|
|
|
|
diff --git a/configure.ac b/configure.ac
|
|
|
|
|
index b49d127..6b87389 100644
|
|
|
|
|
--- a/configure.ac
|
|
|
|
|
+++ b/configure.ac
|
|
|
|
|
@@ -370,6 +370,8 @@ fi
|
|
|
|
|
AM_CONDITIONAL(HAVE_LIBCPUFREQ, test x$have_libcpufreq = xyes)
|
|
|
|
|
AC_SUBST(LIBCPUFREQ_LIBS)
|
|
|
|
|
|
|
|
|
|
+AC_CHECK_HEADERS([cpupower.h])
|
|
|
|
|
+
|
|
|
|
|
build_cpufreq_applet=no
|
|
|
|
|
|
|
|
|
|
if test x$disable_cpufreq = xno; then
|
|
|
|
|
diff --git a/cpufreq/src/cpufreq-monitor-libcpufreq.c b/cpufreq/src/cpufreq-monitor-libcpufreq.c
|
|
|
|
|
index 4fa9d4c..ba52fde 100644
|
|
|
|
|
--- a/cpufreq/src/cpufreq-monitor-libcpufreq.c
|
|
|
|
|
+++ b/cpufreq/src/cpufreq-monitor-libcpufreq.c
|
|
|
|
|
@@ -19,12 +19,16 @@
|
|
|
|
|
* Authors : Carlos Garc<72>a Campos <carlosgc@gnome.org>
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
+#include <config.h>
|
|
|
|
|
+
|
|
|
|
|
#include <glib.h>
|
|
|
|
|
#include <glib/gi18n.h>
|
|
|
|
|
|
|
|
|
|
#include <stdlib.h>
|
|
|
|
|
-#include <linux/version.h>
|
|
|
|
|
#include <cpufreq.h>
|
|
|
|
|
+#ifdef HAVE_CPUPOWER_H
|
|
|
|
|
+#include <cpupower.h>
|
|
|
|
|
+#endif
|
|
|
|
|
#include "cpufreq-monitor-libcpufreq.h"
|
|
|
|
|
#include "cpufreq-utils.h"
|
|
|
|
|
|
|
|
|
|
@@ -98,7 +102,7 @@
|
|
|
|
|
return CPUFREQ_MONITOR (monitor);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
-#if LINUX_VERSION_CODE > KERNEL_VERSION(4, 7, 0)
|
|
|
|
|
+#ifndef HAVE_CPUPOWER_H
|
|
|
|
|
extern int cpupower_is_cpu_online (unsigned int cpu);
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
@@ -115,7 +119,7 @@
|
|
|
|
|
/* Check whether it failed because
|
|
|
|
|
* cpu is not online.
|
|
|
|
|
*/
|
|
|
|
|
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 7, 0)
|
|
|
|
|
+#ifndef HAVE_CPUPOWER_H
|
|
|
|
|
if (!cpufreq_cpu_exists (cpu)) {
|
|
|
|
|
#else
|
|
|
|
|
if (cpupower_is_cpu_online (cpu)) {
|