[RFC PATCH 04/23 V2] oom: use N_MEMORY instead N_HIGH_MEMORY

Hillf Danton dhillf at gmail.com
Sat Aug 4 13:54:57 UTC 2012


On Thu, Aug 2, 2012 at 10:52 AM, Lai Jiangshan <laijs at cn.fujitsu.com> wrote:
> N_HIGH_MEMORY stands for the nodes that has normal or high memory.
> N_MEMORY stands for the nodes that has any memory.
>
> The code here need to handle with the nodes which have memory, we should
> use N_MEMORY instead.
>
> Signed-off-by: Lai Jiangshan <laijs at cn.fujitsu.com>
> ---

Acked-by: Hillf Danton <dhillf at gmail.com>

>  mm/oom_kill.c |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/mm/oom_kill.c b/mm/oom_kill.c
> index ac300c9..1e58f12 100644
> --- a/mm/oom_kill.c
> +++ b/mm/oom_kill.c
> @@ -257,7 +257,7 @@ static enum oom_constraint constrained_alloc(struct zonelist *zonelist,
>          * the page allocator means a mempolicy is in effect.  Cpuset policy
>          * is enforced in get_page_from_freelist().
>          */
> -       if (nodemask && !nodes_subset(node_states[N_HIGH_MEMORY], *nodemask)) {
> +       if (nodemask && !nodes_subset(node_states[N_MEMORY], *nodemask)) {
>                 *totalpages = total_swap_pages;
>                 for_each_node_mask(nid, *nodemask)
>                         *totalpages += node_spanned_pages(nid);
> --
> 1.7.1
>


More information about the Containers mailing list