mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Stephen Rothwell <sfr@canb.auug.org.au>
To: Thomas Gleixner <tglx@linutronix.de>, Ingo Molnar <mingo@elte.hu>,
	"H. Peter Anvin" <hpa@zytor.com>,
	Peter Zijlstra <peterz@infradead.org>
Cc: linux-next@vger.kernel.org, linux-kernel@vger.kernel.org,
	Andi Kleen <ak@linux.intel.com>,
	David Rientjes <rientjes@google.com>,
	Christoph Lameter <cl@linux.com>,
	KOSAKI Motohiro <kosaki.motohiro@jp.fujitsu.com>,
	David Mackey <tdmackey@twitter.com>,
	Pekka Enberg <penberg@kernel.org>
Subject: linux-next: manual merge of the tip tree with the slab tree
Date: Thu, 21 Jun 2012 13:48:44 +1000	[thread overview]
Message-ID: <20120621134844.36eacc287e76a38b960f2ef2@canb.auug.org.au> (raw)

[-- Attachment #1: Type: text/plain, Size: 1452 bytes --]

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@canb.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;
  

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

             reply	other threads:[~2012-06-21  3:48 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-06-21  3:48 Stephen Rothwell [this message]
2012-06-21  7:24 ` David Rientjes
  -- strict thread matches above, loose matches on Subject: below --
2010-09-23  3:44 Stephen Rothwell
2010-09-23  9:33 ` Pekka Enberg
2010-09-23  9:46   ` Tejun Heo
     [not found] <20090706144051.06d079a5.sfr@canb.auug.org.au>
2009-07-06  8:01 ` Pekka Enberg
     [not found] ` <20090914155219.13118819.sfr@canb.auug.org.au>
2009-09-14  6:35   ` Pekka Enberg
2009-06-16  5:46 Stephen Rothwell
2009-06-16  5:48 ` Pekka Enberg
2009-06-16  7:44   ` Ingo Molnar
2009-06-16  7:46     ` Pekka Enberg

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20120621134844.36eacc287e76a38b960f2ef2@canb.auug.org.au \
    --to=sfr@canb.auug.org.au \
    --cc=ak@linux.intel.com \
    --cc=cl@linux.com \
    --cc=hpa@zytor.com \
    --cc=kosaki.motohiro@jp.fujitsu.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-next@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=penberg@kernel.org \
    --cc=peterz@infradead.org \
    --cc=rientjes@google.com \
    --cc=tdmackey@twitter.com \
    --cc=tglx@linutronix.de \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®