/*
* A cached value of the page's pageblock's migratetype, used when the page is
* put on a pcplist. Used to avoid the pageblock migratetype lookup when
-@@ -2095,12 +2116,13 @@ __rmqueue(struct zone *zone, unsigned in
+@@ -2094,12 +2115,13 @@ __rmqueue(struct zone *zone, unsigned in
if (IS_ENABLED(CONFIG_CMA)) {
/*
* Balance movable allocations between regular and CMA areas by
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
-@@ -2974,7 +2974,9 @@ void __init numa_policy_init(void)
+@@ -2963,7 +2963,9 @@ void __init numa_policy_init(void)
/* Reset policy of current process to default */
void numa_default_policy(void)
{
}
/*
-@@ -2992,7 +2994,6 @@ static const char * const policy_modes[]
+@@ -2981,7 +2983,6 @@ static const char * const policy_modes[]
};
/**
* mpol_parse_str - parse string to mempolicy, for tmpfs mpol mount option.
* @str: string containing mempolicy to parse
-@@ -3005,13 +3006,18 @@ static const char * const policy_modes[]
+@@ -2994,13 +2995,18 @@ static const char * const policy_modes[]
*/
int mpol_parse_str(char *str, struct mempolicy **mpol)
{
if (flags)
*flags++ = '\0'; /* terminate mode string */
-@@ -3090,9 +3096,16 @@ int mpol_parse_str(char *str, struct mem
+@@ -3079,9 +3085,16 @@ int mpol_parse_str(char *str, struct mem
goto out;
}
/*
* Save nodes for mpol_to_str() to show the tmpfs mount options
-@@ -3125,7 +3138,29 @@ out:
+@@ -3114,7 +3127,29 @@ out:
*mpol = new;
return err;
}