mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git
synced 2024-12-29 09:12:07 +00:00
mm: mempolicy: Make MPOL_LOCAL a real policy
Make MPOL_LOCAL a real and exposed policy such that applications that relied on the previous default behaviour can explicitly request it. Requested-by: Christoph Lameter <cl@linux.com> Reviewed-by: Rik van Riel <riel@redhat.com> Cc: Lee Schermerhorn <Lee.Schermerhorn@hp.com> Cc: Andrew Morton <akpm@linux-foundation.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> Signed-off-by: Ingo Molnar <mingo@kernel.org> Signed-off-by: Mel Gorman <mgorman@suse.de>
This commit is contained in:
parent
d10e63f294
commit
479e2802d0
@ -20,6 +20,7 @@ enum {
|
||||
MPOL_PREFERRED,
|
||||
MPOL_BIND,
|
||||
MPOL_INTERLEAVE,
|
||||
MPOL_LOCAL,
|
||||
MPOL_MAX, /* always last member of enum */
|
||||
};
|
||||
|
||||
|
@ -269,6 +269,10 @@ static struct mempolicy *mpol_new(unsigned short mode, unsigned short flags,
|
||||
(flags & MPOL_F_RELATIVE_NODES)))
|
||||
return ERR_PTR(-EINVAL);
|
||||
}
|
||||
} else if (mode == MPOL_LOCAL) {
|
||||
if (!nodes_empty(*nodes))
|
||||
return ERR_PTR(-EINVAL);
|
||||
mode = MPOL_PREFERRED;
|
||||
} else if (nodes_empty(*nodes))
|
||||
return ERR_PTR(-EINVAL);
|
||||
policy = kmem_cache_alloc(policy_cache, GFP_KERNEL);
|
||||
@ -2399,7 +2403,6 @@ void numa_default_policy(void)
|
||||
* "local" is pseudo-policy: MPOL_PREFERRED with MPOL_F_LOCAL flag
|
||||
* Used only for mpol_parse_str() and mpol_to_str()
|
||||
*/
|
||||
#define MPOL_LOCAL MPOL_MAX
|
||||
static const char * const policy_modes[] =
|
||||
{
|
||||
[MPOL_DEFAULT] = "default",
|
||||
@ -2452,12 +2455,12 @@ int mpol_parse_str(char *str, struct mempolicy **mpol, int no_context)
|
||||
if (flags)
|
||||
*flags++ = '\0'; /* terminate mode string */
|
||||
|
||||
for (mode = 0; mode <= MPOL_LOCAL; mode++) {
|
||||
for (mode = 0; mode < MPOL_MAX; mode++) {
|
||||
if (!strcmp(str, policy_modes[mode])) {
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (mode > MPOL_LOCAL)
|
||||
if (mode >= MPOL_MAX)
|
||||
goto out;
|
||||
|
||||
switch (mode) {
|
||||
|
Loading…
Reference in New Issue
Block a user