From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Pekka Enberg <penberg@cs•helsinki.fi>,
Christoph Lameter <cl@linux-foundation•org>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>
Subject: linux-next: manual merge of the slab tree with Linus' tree
Date: Mon, 9 May 2011 12:41:58 +1000 [thread overview]
Message-ID: <20110509124158.1c099f24.sfr@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the slab tree got a conflict in mm/slub.c
between commit 30106b8ce2cc ("slub: Fix the lockless code on 32-bit
platforms with no 64-bit cmpxchg") from Linus' tree and commit
1759415e630e ("slub: Remove CONFIG_CMPXCHG_LOCAL ifdeffery") from the
slab tree.
Just context changes (maybe). I fixed it up (see below) and can carry
the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
diff --cc mm/slub.c
index 9d2e5e4,461199f..0000000
--- a/mm/slub.c
+++ b/mm/slub.c
@@@ -1927,9 -1918,8 +1918,8 @@@ redo
object = __slab_alloc(s, gfpflags, node, addr, c);
else {
- #ifdef CONFIG_CMPXCHG_LOCAL
/*
- * The cmpxchg will only match if there was no additonal
+ * The cmpxchg will only match if there was no additional
* operation and if we are on the right processor.
*
* The cmpxchg does the following atomically (without lock semantics!)
@@@ -2144,8 -2103,7 +2103,7 @@@ redo
if (likely(page == c->page && c->node != NUMA_NO_NODE)) {
set_freepointer(s, object, c->freelist);
- #ifdef CONFIG_CMPXCHG_LOCAL
- if (unlikely(!this_cpu_cmpxchg_double(
+ if (unlikely(!irqsafe_cpu_cmpxchg_double(
s->cpu_slab->freelist, s->cpu_slab->tid,
c->freelist, tid,
object, next_tid(tid)))) {
next reply other threads:[~2011-05-09 2:48 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-09 2:41 Stephen Rothwell [this message]
2011-05-09 15:39 ` linux-next: manual merge of the slab tree with Linus' tree Christoph Lameter
-- strict thread matches above, loose matches on Subject: below --
2024-06-03 2:33 Stephen Rothwell
2009-03-05 5:18 Stephen Rothwell
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=20110509124158.1c099f24.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=cl@linux-foundation$(echo .)org \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=penberg@cs$(echo .)helsinki.fi \
--cc=tglx@linutronix$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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