Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5966514d authored by Paul Jackson's avatar Paul Jackson Committed by Linus Torvalds
Browse files

[PATCH] cpuset: mempolicy one more nodemask conversion 



Finish converting mm/mempolicy.c from bitmaps to nodemasks.  The previous
conversion had left one routine using bitmaps, since it involved a
corresponding change to kernel/cpuset.c

Fix that interface by replacing with a simple macro that calls nodes_subset(),
or if !CONFIG_CPUSET, returns (1).

Signed-off-by: default avatarPaul Jackson <pj@sgi.com>
Cc: Christoph Lameter <christoph@lameter.com>
Cc: Andi Kleen <ak@muc.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 96b7f341

include/linux/cpuset.h

+3 −2
Original line number Diff line number Diff line
@@ -21,7 +21,8 @@ extern void cpuset_exit(struct task_struct *p); 
extern cpumask_t cpuset_cpus_allowed(const struct task_struct *p);

void cpuset_init_current_mems_allowed(void);

void cpuset_update_current_mems_allowed(void);

void cpuset_restrict_to_mems_allowed(unsigned long *nodes);

#define cpuset_nodes_subset_current_mems_allowed(nodes) \

		nodes_subset((nodes), current->mems_allowed)

int cpuset_zonelist_valid_mems_allowed(struct zonelist *zl);

extern int cpuset_zone_allowed(struct zone *z, gfp_t gfp_mask);

extern int cpuset_excl_nodes_overlap(const struct task_struct *p);
@@ -42,7 +43,7 @@ static inline cpumask_t cpuset_cpus_allowed(struct task_struct *p) 


static inline void cpuset_init_current_mems_allowed(void) {}

static inline void cpuset_update_current_mems_allowed(void) {}

static inline void cpuset_restrict_to_mems_allowed(unsigned long *nodes) {}

#define cpuset_nodes_subset_current_mems_allowed(nodes) (1)



static inline int cpuset_zonelist_valid_mems_allowed(struct zonelist *zl)

{

kernel/cpuset.c

+0 −10
Original line number Diff line number Diff line
@@ -1749,16 +1749,6 @@ done: 
		refresh_mems();

}



/**

 * cpuset_restrict_to_mems_allowed - limit nodes to current mems_allowed

 * @nodes: pointer to a node bitmap that is and-ed with mems_allowed

 */

void cpuset_restrict_to_mems_allowed(unsigned long *nodes)

{

	bitmap_and(nodes, nodes, nodes_addr(current->mems_allowed),

							MAX_NUMNODES);

}



/**

 * cpuset_zonelist_valid_mems_allowed - check zonelist vs. curremt mems_allowed

 * @zl: the zonelist to be checked

mm/mempolicy.c

+2 −3
Original line number Diff line number Diff line
@@ -387,10 +387,9 @@ static int contextualize_policy(int mode, nodemask_t *nodes) 
	if (!nodes)

		return 0;



	/* Update current mems_allowed */

	cpuset_update_current_mems_allowed();

	/* Ignore nodes not set in current->mems_allowed */

	cpuset_restrict_to_mems_allowed(nodes->bits);

	if (!cpuset_nodes_subset_current_mems_allowed(*nodes))

		return -EINVAL;

	return mpol_check_policy(mode, nodes);

}