Merge branches 'tracing/ftrace', 'tracing/ring-buffer', 'tracing/sysprof', 'tracing/urgent' and 'linus' into tracing/core

2009-02-13 10:25:18 +01:00
parent e7669b8e32 00f62f614b b22f485812 071a0bc2ce
commit 1c511f740f
140 changed files with 1090 additions and 631 deletions
--- a/mm/slab.c
+++ b/mm/slab.c
@ -4514,3 +4514,4 @@ size_t ksize(const void *objp)

 	return obj_size(virt_to_cache(objp));
 }
+EXPORT_SYMBOL(ksize);