aboutsummaryrefslogtreecommitdiffstats
path: root/mm
diff options
context:
space:
mode:
authorDavid Rientjes <rientjes@google.com>2014-01-30 18:46:08 -0500
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2014-02-06 14:08:12 -0500
commit126f36274f181043c29188cda4f1c4296dc98a79 (patch)
tree6f3b9c40ef3f3213dbfb704cd32f0e4aa51ed024 /mm
parent6065e532d141ec0cc6f621021f081642d8d6c141 (diff)
mm/mempolicy.c: fix mempolicy printing in numa_maps
commit 8790c71a18e5d2d93532ae250bcf5eddbba729cd upstream. As a result of commit 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@google.com> Reported-by: Robert Lippert <rlippert@google.com> Cc: Peter Zijlstra <peterz@infradead.org> Acked-by: Mel Gorman <mgorman@suse.de> Cc: Ingo Molnar <mingo@kernel.org> Cc: <stable@vger.kernel.org> [3.7+] Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'mm')
-rw-r--r--mm/mempolicy.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index 4baf12e534d1..6c2dace665aa 100644
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -2801,7 +2801,7 @@ int mpol_to_str(char *buffer, int maxlen, struct mempolicy *pol)
2801 */ 2801 */
2802 VM_BUG_ON(maxlen < strlen("interleave") + strlen("relative") + 16); 2802 VM_BUG_ON(maxlen < strlen("interleave") + strlen("relative") + 16);
2803 2803
2804 if (!pol || pol == &default_policy) 2804 if (!pol || pol == &default_policy || (pol->flags & MPOL_F_MORON))
2805 mode = MPOL_DEFAULT; 2805 mode = MPOL_DEFAULT;
2806 else 2806 else
2807 mode = pol->mode; 2807 mode = pol->mode;