Commit 8790c71a authored by David Rientjes's avatar David Rientjes Committed by Linus Torvalds

mm/mempolicy.c: fix mempolicy printing in numa_maps

As a result of commit 5606e387 ("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: default avatarDavid Rientjes <rientjes@google.com>
Reported-by: default avatarRobert Lippert <rlippert@google.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Acked-by: default avatarMel Gorman <mgorman@suse.de>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: <stable@vger.kernel.org>	[3.7+]
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent e46e3315
...@@ -2930,7 +2930,7 @@ void mpol_to_str(char *buffer, int maxlen, struct mempolicy *pol) ...@@ -2930,7 +2930,7 @@ void mpol_to_str(char *buffer, int maxlen, struct mempolicy *pol)
unsigned short mode = MPOL_DEFAULT; unsigned short mode = MPOL_DEFAULT;
unsigned short flags = 0; unsigned short flags = 0;
if (pol && pol != &default_policy) { if (pol && pol != &default_policy && !(pol->flags & MPOL_F_MORON)) {
mode = pol->mode; mode = pol->mode;
flags = pol->flags; flags = pol->flags;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment