projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-linus' of git://neil.brown.name/md
[firefly-linux-kernel-4.4.55.git]
/
mm
/
quicklist.c
diff --git
a/mm/quicklist.c
b/mm/quicklist.c
index 6eedf7e473d1e89f09fcc5814e342bee01540ce4..6633965bb27bcb609be4578dcb8bcd30cd3e39c8 100644
(file)
--- a/
mm/quicklist.c
+++ b/
mm/quicklist.c
@@
-29,7
+29,6
@@
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;
int node = numa_node_id();
struct zone *zones = NODE_DATA(node)->node_zones;
int num_cpus_on_node;
- const struct cpumask *cpumask_on_node = cpumask_of_node(node);
node_free_pages =
#ifdef CONFIG_ZONE_DMA
node_free_pages =
#ifdef CONFIG_ZONE_DMA
@@
-42,7
+41,7
@@
static unsigned long max_pages(unsigned long min_pages)
max = node_free_pages / FRACTION_OF_NODE_MEM;
max = node_free_pages / FRACTION_OF_NODE_MEM;
- num_cpus_on_node = cpu
s_weight_nr(*cpumask_on_node
);
+ num_cpus_on_node = cpu
mask_weight(cpumask_of_node(node)
);
max /= num_cpus_on_node;
return max(max, min_pages);
max /= num_cpus_on_node;
return max(max, min_pages);