From: Paul Jackson 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: Paul Jackson Cc: Christoph Lameter Cc: Andi Kleen Signed-off-by: Andrew Morton --- include/linux/cpuset.h | 5 +++-- kernel/cpuset.c | 10 ---------- mm/mempolicy.c | 5 ++--- 3 files changed, 5 insertions(+), 15 deletions(-) diff -puN include/linux/cpuset.h~cpuset-mempolicy-one-more-nodemask-conversion include/linux/cpuset.h --- devel/include/linux/cpuset.h~cpuset-mempolicy-one-more-nodemask-conversion 2005-11-22 22:30:41.000000000 -0800 +++ devel-akpm/include/linux/cpuset.h 2005-11-22 22:30:41.000000000 -0800 @@ -21,7 +21,8 @@ extern void cpuset_exit(struct task_stru 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_allo 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) { diff -puN kernel/cpuset.c~cpuset-mempolicy-one-more-nodemask-conversion kernel/cpuset.c --- devel/kernel/cpuset.c~cpuset-mempolicy-one-more-nodemask-conversion 2005-11-22 22:30:41.000000000 -0800 +++ devel-akpm/kernel/cpuset.c 2005-11-22 22:30:41.000000000 -0800 @@ -1824,16 +1824,6 @@ done: } /** - * 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 * diff -puN mm/mempolicy.c~cpuset-mempolicy-one-more-nodemask-conversion mm/mempolicy.c --- devel/mm/mempolicy.c~cpuset-mempolicy-one-more-nodemask-conversion 2005-11-22 22:30:41.000000000 -0800 +++ devel-akpm/mm/mempolicy.c 2005-11-22 22:30:41.000000000 -0800 @@ -396,10 +396,9 @@ static int contextualize_policy(int mode 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); } _