From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756321Ab2FUHY2 (ORCPT ); Thu, 21 Jun 2012 03:24:28 -0400 Received: from mail-pz0-f46.google.com ([209.85.210.46]:55110 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753635Ab2FUHY0 (ORCPT ); Thu, 21 Jun 2012 03:24:26 -0400 Date: Thu, 21 Jun 2012 00:24:23 -0700 (PDT) From: David Rientjes X-X-Sender: rientjes@chino.kir.corp.google.com To: Stephen Rothwell cc: Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , Peter Zijlstra , linux-next@vger.kernel.org, linux-kernel@vger.kernel.org, Andi Kleen , Christoph Lameter , KOSAKI Motohiro , David Mackey , Pekka Enberg Subject: Re: linux-next: manual merge of the tip tree with the slab tree In-Reply-To: <20120621134844.36eacc287e76a38b960f2ef2@canb.auug.org.au> Message-ID: References: <20120621134844.36eacc287e76a38b960f2ef2@canb.auug.org.au> User-Agent: Alpine 2.00 (DEB 1167 2008-08-23) MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Thu, 21 Jun 2012, Stephen Rothwell wrote: > diff --cc mm/slab.c > index dd607a8,5070f96..0000000 > --- a/mm/slab.c > +++ b/mm/slab.c > @@@ -3341,8 -3367,8 +3341,8 @@@ static void *fallback_alloc(struct kmem > local_flags = flags & (GFP_CONSTRAINT_MASK|GFP_RECLAIM_MASK); > > retry_cpuset: > - cpuset_mems_cookie = get_mems_allowed(); > + cpuset_mems_cookie = read_mems_allowed_begin(); > - zonelist = node_zonelist(slab_node(current->mempolicy), flags); > + zonelist = node_zonelist(slab_node(), flags); > > retry: > /* > diff --cc mm/slub.c > index f96d8bc,fb2ef09..0000000 > --- a/mm/slub.c > +++ b/mm/slub.c > @@@ -1616,8 -1616,8 +1616,8 @@@ static void *get_any_partial(struct kme > return NULL; > > do { > - cpuset_mems_cookie = get_mems_allowed(); > + cpuset_mems_cookie = read_mems_allowed_begin(); > - zonelist = node_zonelist(slab_node(current->mempolicy), flags); > + zonelist = node_zonelist(slab_node(), flags); > for_each_zone_zonelist(zone, z, zonelist, high_zoneidx) { > struct kmem_cache_node *n; > Looks good.