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,
"\"Américo Wang\"" <xiyou.wangcong@gmail•com>,
"Matt Mackall" <mpm@selenic•com>,
"Eduard - Gabriel Munteanu" <eduard.munteanu@linux360•ro>,
"Thomas Gleixner" <tglx@linutronix•de>,
"Ingo Molnar" <mingo@elte•hu>, "H. Peter Anvin" <hpa@zytor•com>
Subject: linux-next: manual merge of the slab tree with the ftrace tree
Date: Tue, 20 Jan 2009 14:57:59 +1100 [thread overview]
Message-ID: <20090120145759.e707b9de.sfr@canb.auug.org.au> (raw)
Hi all,
Today's linux-next merge of the slab tree got a conflict in mm/slob.c
between commit 3eae2cb24a96509e0a38cc48dc1538a2826f4e33 ("kmemtrace: SLOB
hooks") from the ftrace tree and commit
6e9ed0cc4b963fde66ab47d9fb19147631e44555 ("slob: clean up the code") from
the slab tree.
I fixed it up (see below) and can carry the fix as necessary.
--
Cheers,
Stephen Rothwell sfr@canb•auug.org.au
http://www.canb.auug.org.au/~sfr/
diff --cc mm/slob.c
index 4d1c0fc,c9cd31d..0000000
--- a/mm/slob.c
+++ b/mm/slob.c
@@@ -475,15 -482,11 +485,15 @@@ void *__kmalloc_node(size_t size, gfp_
if (!m)
return NULL;
*m = size;
- return (void *)m + align;
+ ret = (void *)m + align;
+
+ kmemtrace_mark_alloc_node(KMEMTRACE_TYPE_KMALLOC,
+ _RET_IP_, ret,
+ size, size + align, gfp, node);
} else {
- void *ret;
+ unsigned int order = get_order(size);
- ret = slob_new_page(gfp | __GFP_COMP, order, node);
- ret = slob_new_pages(gfp | __GFP_COMP, get_order(size), node);
++ ret = slob_new_pages(gfp | __GFP_COMP, order, node);
if (ret) {
struct page *page;
page = virt_to_page(ret);
@@@ -583,19 -579,10 +593,19 @@@ void *kmem_cache_alloc_node(struct kmem
{
void *b;
- if (c->size < PAGE_SIZE)
+ if (c->size < PAGE_SIZE) {
b = slob_alloc(c->size, flags, c->align, node);
- else
+ kmemtrace_mark_alloc_node(KMEMTRACE_TYPE_CACHE,
+ _RET_IP_, b, c->size,
+ SLOB_UNITS(c->size) * SLOB_UNIT,
+ flags, node);
+ } else {
- b = slob_new_page(flags, get_order(c->size), node);
+ b = slob_new_pages(flags, get_order(c->size), node);
+ kmemtrace_mark_alloc_node(KMEMTRACE_TYPE_CACHE,
+ _RET_IP_, b, c->size,
+ PAGE_SIZE << get_order(c->size),
+ flags, node);
+ }
if (c->ctor)
c->ctor(b);
next reply other threads:[~2009-01-20 3:58 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-20 3:57 Stephen Rothwell [this message]
2009-01-20 6:01 ` linux-next: manual merge of the slab tree with the ftrace tree Matt Mackall
-- strict thread matches above, loose matches on Subject: below --
2009-02-20 5:57 Stephen Rothwell
2009-02-20 8:25 ` Pekka Enberg
2009-02-20 8:59 ` Stephen Rothwell
2009-02-20 9:37 ` Ingo Molnar
2009-02-20 9:41 ` Pekka Enberg
2009-02-20 9:53 ` Ingo Molnar
2009-02-20 11:12 ` Pekka Enberg
2009-02-20 11:16 ` Ingo Molnar
2009-02-20 23:07 ` Stephen Rothwell
2009-02-20 22:58 ` 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=20090120145759.e707b9de.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=cl@linux-foundation$(echo .)org \
--cc=eduard.munteanu@linux360$(echo .)ro \
--cc=hpa@zytor$(echo .)com \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=mingo@elte$(echo .)hu \
--cc=mpm@selenic$(echo .)com \
--cc=penberg@cs$(echo .)helsinki.fi \
--cc=tglx@linutronix$(echo .)de \
--cc=xiyou.wangcong@gmail$(echo .)com \
/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