Merge branch 'pm-cpufreq'

[firefly-linux-kernel-4.4.55.git] / drivers / base / cpu.c

diff --git a/drivers/base/cpu.c b/drivers/base/cpu.c
index ea23ee7b545b17f10c8bed3d826b49de15a978b0..91bbb1959d8d0a831b7a7f0dc6472f2e5d4937b1 100644 (file)
--- a/drivers/base/cpu.c
+++ b/drivers/base/cpu.c
@@ -16,6 +16,7 @@
 #include <linux/acpi.h>
 #include <linux/of.h>
 #include <linux/cpufeature.h>
+#include <linux/tick.h>
 
 #include "base.h"
 
@@ -40,7 +41,7 @@ static void change_cpu_under_node(struct cpu *cpu,
        cpu->node_id = to_nid;
 }
 
-static int __ref cpu_subsys_online(struct device *dev)
+static int cpu_subsys_online(struct device *dev)
 {
        struct cpu *cpu = container_of(dev, struct cpu, dev);
        int cpuid = dev->id;
@@ -276,6 +277,19 @@ static ssize_t print_cpus_isolated(struct device *dev,
 }
 static DEVICE_ATTR(isolated, 0444, print_cpus_isolated, NULL);
 
+#ifdef CONFIG_NO_HZ_FULL
+static ssize_t print_cpus_nohz_full(struct device *dev,
+                                 struct device_attribute *attr, char *buf)
+{
+       int n = 0, len = PAGE_SIZE-2;
+
+       n = scnprintf(buf, len, "%*pbl\n", cpumask_pr_args(tick_nohz_full_mask));
+
+       return n;
+}
+static DEVICE_ATTR(nohz_full, 0444, print_cpus_nohz_full, NULL);
+#endif
+
 static void cpu_device_release(struct device *dev)
 {
        /*
@@ -443,6 +457,9 @@ static struct attribute *cpu_root_attrs[] = {
        &dev_attr_kernel_max.attr,
        &dev_attr_offline.attr,
        &dev_attr_isolated.attr,
+#ifdef CONFIG_NO_HZ_FULL
+       &dev_attr_nohz_full.attr,
+#endif
 #ifdef CONFIG_GENERIC_CPU_AUTOPROBE
        &dev_attr_modalias.attr,
 #endif