mm: fix return value of scan_lru_pages in memory unplug

[firefly-linux-kernel-4.4.55.git] / mm / mempolicy.c

diff --git a/mm/mempolicy.c b/mm/mempolicy.c
index f29d8d70884d7fb2e170983bf0e551b02740f617..3c6e3e29255caa2e89d446f21892625e0324212e 100644 (file)
--- a/mm/mempolicy.c
+++ b/mm/mempolicy.c
@@ -1482,7 +1482,7 @@ unsigned slab_node(struct mempolicy *policy)
                (void)first_zones_zonelist(zonelist, highest_zoneidx,
                                                        &policy->v.nodes,
                                                        &zone);
-               return zone->node;
+               return zone ? zone->node : numa_node_id();
        }
 
        default: