From aaa9bdff86c2a814c8b6895574bbd7170f955862 Mon Sep 17 00:00:00 2001 From: Pekka Enberg Date: Wed, 26 Nov 2008 10:01:31 +0200 Subject: [PATCH] --- yaml --- r: 123456 b: refs/heads/master c: 8759ec50a6cad7ca5a6d63e657d25b85ab5ba44a h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/mm/slab.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index a3cd0cec0799..766e31b5822f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 89124d706db0aa95daacfa4c0df45a43a44d44f4 +refs/heads/master: 8759ec50a6cad7ca5a6d63e657d25b85ab5ba44a diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c index 09187517f9dc..d4b87690b275 100644 --- a/trunk/mm/slab.c +++ b/trunk/mm/slab.c @@ -2609,7 +2609,7 @@ static struct slab *alloc_slabmgmt(struct kmem_cache *cachep, void *objp, if (OFF_SLAB(cachep)) { /* Slab management obj is off-slab. */ slabp = kmem_cache_alloc_node(cachep->slabp_cache, - local_flags & ~GFP_THISNODE, nodeid); + local_flags, nodeid); if (!slabp) return NULL; } else {