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
page allocator: use a pre-calculated value instead of num_online_nodes() in fast...
[firefly-linux-kernel-4.4.55.git]
/
mm
/
page_alloc.c
diff --git
a/mm/page_alloc.c
b/mm/page_alloc.c
index e60e41474332301f2f67426375a47b0f01d9f65a..0c9f406e3c44ad143713c0dfdc7724736dcf8e35 100644
(file)
--- a/
mm/page_alloc.c
+++ b/
mm/page_alloc.c
@@
-161,7
+161,9
@@
static unsigned long __meminitdata dma_reserve;
#if MAX_NUMNODES > 1
int nr_node_ids __read_mostly = MAX_NUMNODES;
#if MAX_NUMNODES > 1
int nr_node_ids __read_mostly = MAX_NUMNODES;
+int nr_online_nodes __read_mostly = 1;
EXPORT_SYMBOL(nr_node_ids);
EXPORT_SYMBOL(nr_node_ids);
+EXPORT_SYMBOL(nr_online_nodes);
#endif
int page_group_by_mobility_disabled __read_mostly;
#endif
int page_group_by_mobility_disabled __read_mostly;
@@
-1466,7
+1468,7
@@
this_zone_full:
if (NUMA_BUILD)
zlc_mark_zone_full(zonelist, z);
try_next_zone:
if (NUMA_BUILD)
zlc_mark_zone_full(zonelist, z);
try_next_zone:
- if (NUMA_BUILD && !did_zlc_setup && n
um_online_nodes()
> 1) {
+ if (NUMA_BUILD && !did_zlc_setup && n
r_online_nodes
> 1) {
/*
* we do zlc_setup after the first zone is tried but only
* if there are multiple nodes make it worthwhile
/*
* we do zlc_setup after the first zone is tried but only
* if there are multiple nodes make it worthwhile
@@
-2265,7
+2267,7
@@
int numa_zonelist_order_handler(ctl_table *table, int write,
}
}
-#define MAX_NODE_LOAD (n
um_online_nodes()
)
+#define MAX_NODE_LOAD (n
r_online_nodes
)
static int node_load[MAX_NUMNODES];
/**
static int node_load[MAX_NUMNODES];
/**
@@
-2474,7
+2476,7
@@
static void build_zonelists(pg_data_t *pgdat)
/* NUMA-aware ordering of nodes */
local_node = pgdat->node_id;
/* NUMA-aware ordering of nodes */
local_node = pgdat->node_id;
- load = n
um_online_nodes()
;
+ load = n
r_online_nodes
;
prev_node = local_node;
nodes_clear(used_mask);
prev_node = local_node;
nodes_clear(used_mask);
@@
-2625,7
+2627,7
@@
void build_all_zonelists(void)
printk("Built %i zonelists in %s order, mobility grouping %s. "
"Total pages: %ld\n",
printk("Built %i zonelists in %s order, mobility grouping %s. "
"Total pages: %ld\n",
- n
um_online_nodes()
,
+ n
r_online_nodes
,
zonelist_order_name[current_zonelist_order],
page_group_by_mobility_disabled ? "off" : "on",
vm_total_pages);
zonelist_order_name[current_zonelist_order],
page_group_by_mobility_disabled ? "off" : "on",
vm_total_pages);