From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Catalin Marinas <catalin.marinas@arm•com>
Cc: linux-next@vger•kernel.org,
Eduard - Gabriel Munteanu <eduard.munteanu@linux360•ro>,
Thomas Gleixner <tglx@linutronix•de>, Ingo Molnar <mingo@elte•hu>,
"H. Peter Anvin" <hpa@zytor•com>,
Pekka Enberg <penberg@cs•helsinki.fi>
Subject: linux-next: manual merge of the kmemleak tree
Date: Thu, 15 Jan 2009 16:27:17 +1100 [thread overview]
Message-ID: <20090115162717.de2b3a3c.sfr@canb.auug.org.au> (raw)
Hi Catalin,
Today's linux-next merge of the kmemleak tree got a conflict in mm/slob.c
between commit 3eae2cb24a96509e0a38cc48dc1538a2826f4e33 ("kmemtrace: SLOB
hooks") from the ftrace tree and commit
19f8f253a808d317d34ccbbad3b15a1a8d2ac444 ("kmemleak: Add the slob memory
allocation/freeing hooks") from the kmemleak 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,30b870f..0000000
--- a/mm/slob.c
+++ b/mm/slob.c
@@@ -489,12 -482,9 +490,13 @@@ void *__kmalloc_node(size_t size, gfp_
page = virt_to_page(ret);
page->private = size;
}
+
+ kmemtrace_mark_alloc_node(KMEMTRACE_TYPE_KMALLOC,
+ _RET_IP_, ret,
+ size, PAGE_SIZE << order, gfp, node);
}
+ kmemleak_alloc(ret, size, 1, gfp);
return ret;
}
EXPORT_SYMBOL(__kmalloc_node);
next reply other threads:[~2009-01-15 5:27 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-01-15 5:27 Stephen Rothwell [this message]
2009-01-15 10:29 ` linux-next: manual merge of the kmemleak tree Eduard - Gabriel Munteanu
2009-01-15 10:38 ` Ingo Molnar
2009-01-15 12:04 ` Catalin Marinas
2009-01-15 12:27 ` Ingo Molnar
2009-01-15 17:49 ` Eduard - Gabriel Munteanu
2009-04-21 11:14 ` Catalin Marinas
2009-04-21 11:47 ` Catalin Marinas
2009-04-21 18:02 ` Pekka Enberg
-- strict thread matches above, loose matches on Subject: below --
2009-01-19 5:16 Stephen Rothwell
2009-01-15 5:27 Stephen Rothwell
2009-01-15 5:27 Stephen Rothwell
2009-01-15 5:27 Stephen Rothwell
2009-01-15 5:26 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=20090115162717.de2b3a3c.sfr@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=catalin.marinas@arm$(echo .)com \
--cc=eduard.munteanu@linux360$(echo .)ro \
--cc=hpa@zytor$(echo .)com \
--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