git://ftp.safe.ca
/
safe
/
jmp
/
linux-2.6
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sparsemem: on no vmemmap path put mem_map on node high too
[safe/jmp/linux-2.6]
/
mm
/
quicklist.c
diff --git
a/mm/quicklist.c
b/mm/quicklist.c
index
e66d07d
..
2876349
100644
(file)
--- a/
mm/quicklist.c
+++ b/
mm/quicklist.c
@@
-14,12
+14,13
@@
*/
#include <linux/kernel.h>
*/
#include <linux/kernel.h>
+#include <linux/gfp.h>
#include <linux/mm.h>
#include <linux/mmzone.h>
#include <linux/module.h>
#include <linux/quicklist.h>
#include <linux/mm.h>
#include <linux/mmzone.h>
#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
#define FRACTION_OF_NODE_MEM 16
@@
-29,7
+30,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
+42,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);