aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2012-10-11 10:14:16 +0900
committerLinus Torvalds <torvalds@linux-foundation.org>2012-10-11 10:14:16 +0900
commit14ffe009ca60856555df3aec942239d8beed74d3 (patch)
treeb5639c028c996a6907ac0cf6e9f0175398a3a62b /lib
parentce40be7a820bb393ac4ac69865f018d2f4038cf0 (diff)
parentec073619cdda99ffb6a07d3b8000569f5210815a (diff)
downloadvexpress-lsk-14ffe009ca60856555df3aec942239d8beed74d3.tar.gz
Merge branch 'akpm' (Fixups from Andrew)
Merge misc fixes from Andrew Morton: "Followups, fixes and some random stuff I found on the internet." * emailed patches from Andrew Morton <akpm@linux-foundation.org>: (11 patches) perf: fix duplicate header inclusion memcg, kmem: fix build error when CONFIG_INET is disabled rtc: kconfig: fix RTC_INTF defaults connected to RTC_CLASS rapidio: fix comment lib/kasprintf.c: use kmalloc_track_caller() to get accurate traces for kvasprintf rapidio: update for destination ID allocation rapidio: update asynchronous discovery initialization rapidio: use msleep in discovery wait mm: compaction: fix bit ranges in {get,clear,set}_pageblock_skip() arch/powerpc/platforms/pseries/hotplug-memory.c: section removal cleanups arch/powerpc/platforms/pseries/hotplug-memory.c: fix section handling code
Diffstat (limited to 'lib')
-rw-r--r--lib/kasprintf.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/kasprintf.c b/lib/kasprintf.c
index ae0de80c1c8..32f12150fc4 100644
--- a/lib/kasprintf.c
+++ b/lib/kasprintf.c
@@ -21,7 +21,7 @@ char *kvasprintf(gfp_t gfp, const char *fmt, va_list ap)
len = vsnprintf(NULL, 0, fmt, aq);
va_end(aq);
- p = kmalloc(len+1, gfp);
+ p = kmalloc_track_caller(len+1, gfp);
if (!p)
return NULL;