Subject: [merged] mm-mempolicyc-fix-mempolicy-printing-in-numa_maps.patch removed from -mm tree To: rientjes@xxxxxxxxxx,mgorman@xxxxxxx,mingo@xxxxxxxxxx,peterz@xxxxxxxxxxxxx,rlippert@xxxxxxxxxx,stable@xxxxxxxxxxxxxxx,mm-commits@xxxxxxxxxxxxxxx From: akpm@xxxxxxxxxxxxxxxxxxxx Date: Fri, 31 Jan 2014 11:16:36 -0800 The patch titled Subject: mm/mempolicy.c: fix mempolicy printing in numa_maps has been removed from the -mm tree. Its filename was mm-mempolicyc-fix-mempolicy-printing-in-numa_maps.patch This patch was dropped because it was merged into mainline or a subsystem tree ------------------------------------------------------ From: David Rientjes <rientjes@xxxxxxxxxx> Subject: mm/mempolicy.c: fix mempolicy printing in numa_maps As a result of 5606e3877ad8 ("mm: numa: Migrate on reference policy"), /proc/<pid>/numa_maps prints the mempolicy for any <pid> as "prefer:N" for the local node, N, of the process reading the file. This should only be printed when the mempolicy of <pid> is MPOL_PREFERRED for node N. If the process is actually only using the default mempolicy for local node allocation, make sure "default" is printed as expected. Signed-off-by: David Rientjes <rientjes@xxxxxxxxxx> Reported-by: Robert Lippert <rlippert@xxxxxxxxxx> Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx> Acked-by: Mel Gorman <mgorman@xxxxxxx> Cc: Ingo Molnar <mingo@xxxxxxxxxx> Cc: <stable@xxxxxxxxxxxxxxx> [3.7+] Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx> --- mm/mempolicy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff -puN mm/mempolicy.c~mm-mempolicyc-fix-mempolicy-printing-in-numa_maps mm/mempolicy.c --- a/mm/mempolicy.c~mm-mempolicyc-fix-mempolicy-printing-in-numa_maps +++ a/mm/mempolicy.c @@ -2930,7 +2930,7 @@ void mpol_to_str(char *buffer, int maxle unsigned short mode = MPOL_DEFAULT; unsigned short flags = 0; - if (pol && pol != &default_policy) { + if (pol && pol != &default_policy && !(pol->flags & MPOL_F_MORON)) { mode = pol->mode; flags = pol->flags; } _ Patches currently in -mm which might be from rientjes@xxxxxxxxxx are origin.patch numa-mem-hotplug-initialize-numa_kernel_nodes-in-numa_clear_kernel_node_hotplug.patch numa-mem-hotplug-initialize-numa_kernel_nodes-in-numa_clear_kernel_node_hotplug-fix.patch numa-mem-hotplug-fix-array-index-overflow-when-synchronizing-nid-to-memblockreserved.patch mm-slb-fix-misleading-comments.patch mm-compaction-ignore-pageblock-skip-when-manually-invoking-compaction.patch mm-remove-bug_on-from-mlock_vma_page.patch memcg-do-not-hang-on-oom-when-killed-by-userspace-oom-access-to-memory-reserves.patch cpusets-allocate-heap-only-when-required.patch linux-next.patch -- To unsubscribe from this list: send the line "unsubscribe stable" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html