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-next>] [day] [month] [year] [list]
Date:	Thu, 21 Jun 2012 13:48:44 +1000
From:	Stephen Rothwell <sfr@...b.auug.org.au>
To:	Thomas Gleixner <tglx@...utronix.de>, Ingo Molnar <mingo@...e.hu>,
	"H. Peter Anvin" <hpa@...or.com>,
	Peter Zijlstra <peterz@...radead.org>
Cc:	linux-next@...r.kernel.org, linux-kernel@...r.kernel.org,
	Andi Kleen <ak@...ux.intel.com>,
	David Rientjes <rientjes@...gle.com>,
	Christoph Lameter <cl@...ux.com>,
	KOSAKI Motohiro <kosaki.motohiro@...fujitsu.com>,
	David Mackey <tdmackey@...tter.com>,
	Pekka Enberg <penberg@...nel.org>
Subject: linux-next: manual merge of the tip tree with the slab tree

Hi all,

Today's linux-next merge of the tip tree got conflicts in mm/slab.c and
mm/slub.c between commit e7b691b085fd ("slab/mempolicy: always use local
policy from interrupt context") from the slab tree and commit
2ab41dd59922 ("mm: Optimize put_mems_allowed() usage") from the tip tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@...b.auug.org.au

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;
  

Content of type "application/pgp-signature" skipped

Powered by blists - more mailing lists