Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next

[firefly-linux-kernel-4.4.55.git] / arch / arm / kernel / topology.c

diff --git a/arch/arm/kernel/topology.c b/arch/arm/kernel/topology.c
index 71e1fec6d31a5b76d6a82249092e47b88c7ad4da..3997c411c1403659123d188c1c0750c58f59af3f 100644 (file)
--- a/arch/arm/kernel/topology.c
+++ b/arch/arm/kernel/topology.c
@@ -91,13 +91,13 @@ static void __init parse_dt_topology(void)
 {
        const struct cpu_efficiency *cpu_eff;
        struct device_node *cn = NULL;
-       unsigned long min_capacity = (unsigned long)(-1);
+       unsigned long min_capacity = ULONG_MAX;
        unsigned long max_capacity = 0;
        unsigned long capacity = 0;
-       int alloc_size, cpu = 0;
+       int cpu = 0;
 
-       alloc_size = nr_cpu_ids * sizeof(*__cpu_capacity);
-       __cpu_capacity = kzalloc(alloc_size, GFP_NOWAIT);
+       __cpu_capacity = kcalloc(nr_cpu_ids, sizeof(*__cpu_capacity),
+                                GFP_NOWAIT);
 
        for_each_possible_cpu(cpu) {
                const u32 *rate;