From eb111749e9c5555a6393572364a0199d755c9358 Mon Sep 17 00:00:00 2001 From: Andrew Morton Date: Thu, 28 Jul 2011 13:59:49 -0700 Subject: [PATCH] --- yaml --- r: 261807 b: refs/heads/master c: eacbbae385bf492229e84024863960d3160547c7 h: refs/heads/master i: 261805: 72537df5381a1200c30a114207291b08c21a55be 261803: 0671b807dd8af06036b8cbbda8505fe0e0b1d2c0 261799: a38ecf01bc12cee4c64af6276e6d89b259d84168 261791: 57a18ad3ecbf30da8ba906d1eb76209f7939ecc2 v: v3 --- [refs] | 2 +- trunk/mm/slab.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 46751aec0eec..d7dae0a8298c 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: acfe7d74484d6ccb25a80b8ff259fceceac0473e +refs/heads/master: eacbbae385bf492229e84024863960d3160547c7 diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c index b80282aef73b..95947400702b 100644 --- a/trunk/mm/slab.c +++ b/trunk/mm/slab.c @@ -3403,7 +3403,7 @@ __cache_alloc_node(struct kmem_cache *cachep, gfp_t flags, int nodeid, cache_alloc_debugcheck_before(cachep, flags); local_irq_save(save_flags); - if (nodeid == -1) + if (nodeid == NUMA_NO_NODE) nodeid = slab_node; if (unlikely(!cachep->nodelists[nodeid])) {