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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [day] [month] [year] [list]

Message-ID: <alpine.DEB.2.00.1206210024030.31077@chino.kir.corp.google.com>
Date:	Thu, 21 Jun 2012 00:24:23 -0700 (PDT)
From:	David Rientjes <rientjes@...gle.com>
To:	Stephen Rothwell <sfr@...b.auug.org.au>
cc:	Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
	"H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>,
	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Andi Kleen <ak@...ux.intel.com>,
	Christoph Lameter <cl@...ux.com>,
	KOSAKI Motohiro <kosaki.motohiro@...fujitsu.com>,
	David Mackey <tdmackey@...tter.com>,
	Pekka Enberg <penberg@...nel.org>
Subject: Re: linux-next: manual merge of the tip tree with the slab tree

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@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/