mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 19:21:31 -04:00
mm, mempolicy: rename slab_node for clarity
slab_node() is actually a mempolicy function, so rename it to mempolicy_slab_node() to make it clearer that it used for processes with mempolicies. At the same time, cleanup its code by saving numa_mem_id() in a local variable (since we require a node with memory, not just any node) and remove an obsolete comment that assumes the mempolicy is actually passed into the function. Signed-off-by: David Rientjes <[email protected]> Acked-by: Christoph Lameter <[email protected]> Cc: Johannes Weiner <[email protected]> Cc: Michal Hocko <[email protected]> Cc: KAMEZAWA Hiroyuki <[email protected]> Cc: Christoph Lameter <[email protected]> Cc: Pekka Enberg <[email protected]> Cc: Tejun Heo <[email protected]> Cc: Mel Gorman <[email protected]> Cc: Oleg Nesterov <[email protected]> Cc: Rik van Riel <[email protected]> Cc: Jianguo Wu <[email protected]> Cc: Tim Hockin <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
This commit is contained in:
parent
514ddb446c
commit
2a389610a7
4 changed files with 10 additions and 13 deletions
|
|
@ -1782,21 +1782,18 @@ static unsigned interleave_nodes(struct mempolicy *policy)
|
|||
/*
|
||||
* Depending on the memory policy provide a node from which to allocate the
|
||||
* next slab entry.
|
||||
* @policy must be protected by freeing by the caller. If @policy is
|
||||
* the current task's mempolicy, this protection is implicit, as only the
|
||||
* task can change it's policy. The system default policy requires no
|
||||
* such protection.
|
||||
*/
|
||||
unsigned slab_node(void)
|
||||
unsigned int mempolicy_slab_node(void)
|
||||
{
|
||||
struct mempolicy *policy;
|
||||
int node = numa_mem_id();
|
||||
|
||||
if (in_interrupt())
|
||||
return numa_node_id();
|
||||
return node;
|
||||
|
||||
policy = current->mempolicy;
|
||||
if (!policy || policy->flags & MPOL_F_LOCAL)
|
||||
return numa_node_id();
|
||||
return node;
|
||||
|
||||
switch (policy->mode) {
|
||||
case MPOL_PREFERRED:
|
||||
|
|
@ -1816,11 +1813,11 @@ unsigned slab_node(void)
|
|||
struct zonelist *zonelist;
|
||||
struct zone *zone;
|
||||
enum zone_type highest_zoneidx = gfp_zone(GFP_KERNEL);
|
||||
zonelist = &NODE_DATA(numa_node_id())->node_zonelists[0];
|
||||
zonelist = &NODE_DATA(node)->node_zonelists[0];
|
||||
(void)first_zones_zonelist(zonelist, highest_zoneidx,
|
||||
&policy->v.nodes,
|
||||
&zone);
|
||||
return zone ? zone->node : numa_node_id();
|
||||
return zone ? zone->node : node;
|
||||
}
|
||||
|
||||
default:
|
||||
|
|
|
|||
Loading…
Reference in a new issue