3 files changed, 2 insertions, 88 deletions
diff --git a/include/linux/kmemtrace.h b/include/linux/kmemtrace.h
deleted file mode 100644
index 5bea8ead6a6b..000000000000
--- a/include/linux/kmemtrace.h
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (C) 2008 Eduard - Gabriel Munteanu
- *
- * This file is released under GPL version 2.
- */
-#ifndef _LINUX_KMEMTRACE_H
-#define _LINUX_KMEMTRACE_H
-#ifdef __KERNEL__
-#include <linux/types.h>
-#include <linux/marker.h>
-enum kmemtrace_type_id {
-        KMEMTRACE_TYPE_KMALLOC = 0,     /* kmalloc() or kfree(). */
-        KMEMTRACE_TYPE_CACHE,           /* kmem_cache_*(). */
-        KMEMTRACE_TYPE_PAGES,           /* __get_free_pages() and friends. */
-};
-#ifdef CONFIG_KMEMTRACE
-extern void kmemtrace_init(void);
-static inline void kmemtrace_mark_alloc_node(enum kmemtrace_type_id type_id,
-                                             unsigned long call_site,
-                                             const void *ptr,
-                                             size_t bytes_req,
-                                             size_t bytes_alloc,
-                                             gfp_t gfp_flags,
-                                             int node)
-{
-        trace_mark(kmemtrace_alloc, "type_id %d call_site %lu ptr %lu "
-                   "bytes_req %lu bytes_alloc %lu gfp_flags %lu node %d",
-                   type_id, call_site, (unsigned long) ptr,
-                   (unsigned long) bytes_req, (unsigned long) bytes_alloc,
-                   (unsigned long) gfp_flags, node);
-}
-static inline void kmemtrace_mark_free(enum kmemtrace_type_id type_id,
-                                       unsigned long call_site,
-                                       const void *ptr)
-{
-        trace_mark(kmemtrace_free, "type_id %d call_site %lu ptr %lu",
-                   type_id, call_site, (unsigned long) ptr);
-}
-#else /* CONFIG_KMEMTRACE */
-static inline void kmemtrace_init(void)
-{
-}
-static inline void kmemtrace_mark_alloc_node(enum kmemtrace_type_id type_id,
-                                             unsigned long call_site,
-                                             const void *ptr,
-                                             size_t bytes_req,
-                                             size_t bytes_alloc,
-                                             gfp_t gfp_flags,
-                                             int node)
-{
-}
-static inline void kmemtrace_mark_free(enum kmemtrace_type_id type_id,
-                                       unsigned long call_site,
-                                       const void *ptr)
-{
-}
-#endif /* CONFIG_KMEMTRACE */
-static inline void kmemtrace_mark_alloc(enum kmemtrace_type_id type_id,
-                                        unsigned long call_site,
-                                        const void *ptr,
-                                        size_t bytes_req,
-                                        size_t bytes_alloc,
-                                        gfp_t gfp_flags)
-{
-        kmemtrace_mark_alloc_node(type_id, call_site, ptr,
-                                  bytes_req, bytes_alloc, gfp_flags, -1);
-}
-#endif /* __KERNEL__ */
-#endif /* _LINUX_KMEMTRACE_H */
diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h
index 7555ce99f6d2..455f9affea9a 100644
--- a/include/linux/slab_def.h
+++ b/include/linux/slab_def.h
@@ -14,7 +14,7 @@
 #include <asm/page.h>           /* kmalloc_sizes.h needs PAGE_SIZE */
 #include <asm/cache.h>          /* kmalloc_sizes.h needs L1_CACHE_BYTES */
 #include <linux/compiler.h>
-#include <linux/kmemtrace.h>
+#include <trace/kmemtrace.h>
 /* Size description struct for general caches. */
 struct cache_sizes {
diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h
index dc28432b5b9a..6b657f7dcb2b 100644
--- a/include/linux/slub_def.h
+++ b/include/linux/slub_def.h
@@ -10,7 +10,7 @@
 #include <linux/gfp.h>
 #include <linux/workqueue.h>
 #include <linux/kobject.h>
-#include <linux/kmemtrace.h>
+#include <trace/kmemtrace.h>
 enum stat_item {
        ALLOC_FASTPATH,         /* Allocation from cpu slab */

diff --git a/include/linux/kmemtrace.h b/include/linux/kmemtrace.h deleted file mode 100644 index 5bea8ead6a6b..000000000000 --- a/include/linux/kmemtrace.h +++ /dev/null
@@ -1,86 +0,0 @@
1	/*
2	* Copyright (C) 2008 Eduard - Gabriel Munteanu
3	*
4	* This file is released under GPL version 2.
5	*/
6
7	#ifndef _LINUX_KMEMTRACE_H
8	#define _LINUX_KMEMTRACE_H
9
10	#ifdef __KERNEL__
11
12	#include <linux/types.h>
13	#include <linux/marker.h>
14
15	enum kmemtrace_type_id {
16	KMEMTRACE_TYPE_KMALLOC = 0, /* kmalloc() or kfree(). */
17	KMEMTRACE_TYPE_CACHE, /* kmem_cache_(). /
18	KMEMTRACE_TYPE_PAGES, /* __get_free_pages() and friends. */
19	};
20
21	#ifdef CONFIG_KMEMTRACE
22
23	extern void kmemtrace_init(void);
24
25	static inline void kmemtrace_mark_alloc_node(enum kmemtrace_type_id type_id,
26	unsigned long call_site,
27	const void *ptr,
28	size_t bytes_req,
29	size_t bytes_alloc,
30	gfp_t gfp_flags,
31	int node)
32	{
33	trace_mark(kmemtrace_alloc, "type_id %d call_site %lu ptr %lu "
34	"bytes_req %lu bytes_alloc %lu gfp_flags %lu node %d",
35	type_id, call_site, (unsigned long) ptr,
36	(unsigned long) bytes_req, (unsigned long) bytes_alloc,
37	(unsigned long) gfp_flags, node);
38	}
39
40	static inline void kmemtrace_mark_free(enum kmemtrace_type_id type_id,
41	unsigned long call_site,
42	const void *ptr)
43	{
44	trace_mark(kmemtrace_free, "type_id %d call_site %lu ptr %lu",
45	type_id, call_site, (unsigned long) ptr);
46	}
47
48	#else /* CONFIG_KMEMTRACE */
49
50	static inline void kmemtrace_init(void)
51	{
52	}
53
54	static inline void kmemtrace_mark_alloc_node(enum kmemtrace_type_id type_id,
55	unsigned long call_site,
56	const void *ptr,
57	size_t bytes_req,
58	size_t bytes_alloc,
59	gfp_t gfp_flags,
60	int node)
61	{
62	}
63
64	static inline void kmemtrace_mark_free(enum kmemtrace_type_id type_id,
65	unsigned long call_site,
66	const void *ptr)
67	{
68	}
69
70	#endif /* CONFIG_KMEMTRACE */
71
72	static inline void kmemtrace_mark_alloc(enum kmemtrace_type_id type_id,
73	unsigned long call_site,
74	const void *ptr,
75	size_t bytes_req,
76	size_t bytes_alloc,
77	gfp_t gfp_flags)
78	{
79	kmemtrace_mark_alloc_node(type_id, call_site, ptr,
80	bytes_req, bytes_alloc, gfp_flags, -1);
81	}
82
83	#endif /* __KERNEL__ */
84
85	#endif /* _LINUX_KMEMTRACE_H */
86


diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h index 7555ce99f6d2..455f9affea9a 100644 --- a/include/linux/slab_def.h +++ b/include/linux/slab_def.h
@@ -14,7 +14,7 @@
14	#include <asm/page.h> /* kmalloc_sizes.h needs PAGE_SIZE */	14	#include <asm/page.h> /* kmalloc_sizes.h needs PAGE_SIZE */
15	#include <asm/cache.h> /* kmalloc_sizes.h needs L1_CACHE_BYTES */	15	#include <asm/cache.h> /* kmalloc_sizes.h needs L1_CACHE_BYTES */
16	#include <linux/compiler.h>	16	#include <linux/compiler.h>
17	#include <linux/kmemtrace.h>	17	#include <trace/kmemtrace.h>
18		18
19	/* Size description struct for general caches. */	19	/* Size description struct for general caches. */
20	struct cache_sizes {	20	struct cache_sizes {


diff --git a/include/linux/slub_def.h b/include/linux/slub_def.h index dc28432b5b9a..6b657f7dcb2b 100644 --- a/include/linux/slub_def.h +++ b/include/linux/slub_def.h
@@ -10,7 +10,7 @@
10	#include <linux/gfp.h>	10	#include <linux/gfp.h>
11	#include <linux/workqueue.h>	11	#include <linux/workqueue.h>
12	#include <linux/kobject.h>	12	#include <linux/kobject.h>
13	#include <linux/kmemtrace.h>	13	#include <trace/kmemtrace.h>
14		14
15	enum stat_item {	15	enum stat_item {
16	ALLOC_FASTPATH, /* Allocation from cpu slab */	16	ALLOC_FASTPATH, /* Allocation from cpu slab */