diff --git a/[refs] b/[refs] index ecfe661baca6..d07ee714f725 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5d1f57e4d3d547b113ebd62f569be13bf485e53b +refs/heads/master: 15b7c5142049e7efc3071280e1370dc3b8add6f5 diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c index 9f121c10184f..a018019aa91d 100644 --- a/trunk/mm/slub.c +++ b/trunk/mm/slub.c @@ -1718,7 +1718,7 @@ static void *__slab_alloc(struct kmem_cache *s, gfp_t gfpflags, int node, c->page->inuse++; c->page->freelist = get_freepointer(s, object); - c->node = -1; + c->node = NUMA_NO_NODE; goto unlock_out; } @@ -1895,7 +1895,7 @@ static __always_inline void slab_free(struct kmem_cache *s, slab_free_hook_irq(s, x); - if (likely(page == c->page && c->node >= 0)) { + if (likely(page == c->page && c->node != NUMA_NO_NODE)) { set_freepointer(s, object, c->freelist); c->freelist = object; stat(s, FREE_FASTPATH);