Re: linux-next: manual merge of the tip tree with the slab tree

[David Rientjes]

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.
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/