Staging: sep: tidy firmware load

[firefly-linux-kernel-4.4.55.git] / mm / quicklist.c

diff --git a/mm/quicklist.c b/mm/quicklist.c
index 8dbb6805ef35a91af20a8aeb7090090e044d86e9..6eedf7e473d1e89f09fcc5814e342bee01540ce4 100644 (file)
--- a/mm/quicklist.c
+++ b/mm/quicklist.c
@@ -19,7 +19,7 @@
 #include <linux/module.h>
 #include <linux/quicklist.h>
 
-DEFINE_PER_CPU(struct quicklist, quicklist)[CONFIG_NR_QUICK];
+DEFINE_PER_CPU(struct quicklist [CONFIG_NR_QUICK], quicklist);
 
 #define FRACTION_OF_NODE_MEM   16
 
@@ -29,7 +29,7 @@ static unsigned long max_pages(unsigned long min_pages)
        int node = numa_node_id();
        struct zone *zones = NODE_DATA(node)->node_zones;
        int num_cpus_on_node;
-       node_to_cpumask_ptr(cpumask_on_node, node);
+       const struct cpumask *cpumask_on_node = cpumask_of_node(node);
 
        node_free_pages =
 #ifdef CONFIG_ZONE_DMA