import PULS_20160108

[GitHub/mt8127/android_kernel_alcatel_ttab.git] / drivers / base / topology.c

diff --git a/drivers/base/topology.c b/drivers/base/topology.c
index ae989c57cd5ec33cd1564ee949e0fab51b158b4a..b703ff05c9f0adb1d0c2a4989a7039acc9e3132b 100644 (file)
--- a/drivers/base/topology.c
+++ b/drivers/base/topology.c
@@ -40,8 +40,14 @@
 static ssize_t show_##name(struct device *dev,                 \
                struct device_attribute *attr, char *buf)       \
 {                                                              \
-       unsigned int cpu = dev->id;                             \
-       return sprintf(buf, "%d\n", topology_##name(cpu));      \
+       return sprintf(buf, "%d\n", topology_##name(dev->id));  \
+}
+#define define_id_lu_show_func(name)                   \
+static ssize_t show_##name(struct device *dev,                 \
+               struct device_attribute *attr, char *buf)       \
+{                                                              \
+       unsigned int cpu = dev->id;                             \
+       return sprintf(buf, "%lu\n", topology_##name(cpu));     \
 }
 
 #if defined(topology_thread_cpumask) || defined(topology_core_cpumask) || \
@@ -122,6 +128,13 @@ define_one_ro_named(book_siblings, show_book_cpumask);
 define_one_ro_named(book_siblings_list, show_book_cpumask_list);
 #endif
 
+#ifdef CONFIG_ARCH_SCALE_INVARIANT_CPU_CAPACITY
+define_id_lu_show_func(max_cpu_capacity);
+define_one_ro(max_cpu_capacity);
+define_id_lu_show_func(cpu_capacity);
+define_one_ro(cpu_capacity);
+#endif
+
 static struct attribute *default_attrs[] = {
        &dev_attr_physical_package_id.attr,
        &dev_attr_core_id.attr,
@@ -133,6 +146,10 @@ static struct attribute *default_attrs[] = {
        &dev_attr_book_id.attr,
        &dev_attr_book_siblings.attr,
        &dev_attr_book_siblings_list.attr,
+#endif
+#ifdef CONFIG_ARCH_SCALE_INVARIANT_CPU_CAPACITY
+       &dev_attr_max_cpu_capacity.attr,
+       &dev_attr_cpu_capacity.attr,
 #endif
        NULL
 };