The patch titled
mbind-restrict-nodes-to-the-currently-allowed-cpuset fix
has been added to the -mm tree. Its filename is
mbind-restrict-nodes-to-the-currently-allowed-cpuset-fix.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: mbind-restrict-nodes-to-the-currently-allowed-cpuset fix
From: Christoph Lameter <clameter@xxxxxxx>
mems_allowed only exists if CONFIG_CPUSETS is set. So put an #ifdef around
it. Also move the masking of the nodes behind the error check (looks
better) and add a comment.
Signed-off-by: Christoph Lameter <clameter@xxxxxxx>
Cc: Paul Jackson <pj@xxxxxxx>
Cc: Andy Whitcroft <apw@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
mm/mempolicy.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletion(-)
diff -puN mm/mempolicy.c~mbind-restrict-nodes-to-the-currently-allowed-cpuset-fix mm/mempolicy.c
--- a/mm/mempolicy.c~mbind-restrict-nodes-to-the-currently-allowed-cpuset-fix
+++ a/mm/mempolicy.c
@@ -882,9 +882,12 @@ asmlinkage long sys_mbind(unsigned long
int err;
err = get_nodes(&nodes, nmask, maxnode);
- nodes_and(nodes, nodes, current->mems_allowed);
if (err)
return err;
+#ifdef CONFIG_CPUSETS
+ /* Restrict the nodes to the allowed nodes in the cpuset */
+ nodes_and(nodes, nodes, current->mems_allowed);
+#endif
return do_mbind(start, len, mode, &nodes, flags);
}
_
Patches currently in -mm which might be from clameter@xxxxxxx are
mbind-restrict-nodes-to-the-currently-allowed-cpuset.patch
mbind-restrict-nodes-to-the-currently-allowed-cpuset-fix.patch
slab-cache_grow-cleanup.patch
deal-with-cases-of-zone_dma-meaning-the-first-zone.patch
introduce-config_zone_dma.patch
optional-zone_dma-in-the-vm.patch
optional-zone_dma-in-the-vm-no-gfp_dma-check-in-the-slab-if-no-config_zone_dma-is-set.patch
optional-zone_dma-in-the-vm-no-gfp_dma-check-in-the-slab-if-no-config_zone_dma-is-set-reduce-config_zone_dma-ifdefs.patch
optional-zone_dma-for-ia64.patch
remove-zone_dma-remains-from-parisc.patch
remove-zone_dma-remains-from-sh-sh64.patch
set-config_zone_dma-for-arches-with-generic_isa_dma.patch
zoneid-fix-up-calculations-for-zoneid_pgshift.patch
mm-only-sched-add-a-few-scheduler-event-counters.patch
zvc-support-nr_slab_reclaimable--nr_slab_unreclaimable-swap_prefetch.patch
reduce-max_nr_zones-swap_prefetch-remove-incorrect-use-of-zone_highmem.patch
numa-add-zone_to_nid-function-swap_prefetch.patch
remove-uses-of-kmem_cache_t-from-mm-and-include-linux-slabh-prefetch.patch
readahead-state-based-method-aging-accounting.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
