diff --git a/[refs] b/[refs] index 5f56f04253a9..68241e5108bd 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b4634484815e1879512a23e4f59eef648135c30a +refs/heads/master: 83b78bd2d31f12d7d9317d9802a1996a7bd8a6f2 diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c index 122d031baab2..e57abd45eede 100644 --- a/trunk/mm/slab.c +++ b/trunk/mm/slab.c @@ -2372,6 +2372,9 @@ void *kmem_cache_alloc_node(kmem_cache_t *cachep, int flags, int nodeid) struct slab *slabp; kmem_bufctl_t next; + if (nodeid == -1) + return kmem_cache_alloc(cachep, flags); + for (loop = 0;;loop++) { struct list_head *q;