From 3854bf5a0af2697e439ea3f71916ee3e174c79c8 Mon Sep 17 00:00:00 2001
From: Zhaolei <zhaolei@cn.fujitsu.com>
Date: Fri, 10 Apr 2009 14:26:18 +0800
Subject: [PATCH] --- yaml --- r: 145994 b: refs/heads/master c:
 02af61bb50f5d5f0322dbe5ab2a0d75808d25c7b h: refs/heads/master v: v3

---
 [refs]                                      |  2 +-
 trunk/include/linux/kmemtrace.h             | 25 +++++++++++++++++++++
 trunk/include/linux/slab_def.h              |  2 +-
 trunk/include/linux/slub_def.h              |  2 +-
 trunk/include/trace/{kmemtrace.h => kmem.h} | 25 +++------------------
 trunk/init/main.c                           |  2 +-
 trunk/kernel/trace/kmemtrace.c              |  2 +-
 trunk/kernel/trace/trace.h                  |  2 +-
 trunk/mm/slab.c                             |  2 +-
 trunk/mm/slob.c                             |  2 +-
 trunk/mm/slub.c                             |  2 +-
 11 files changed, 37 insertions(+), 31 deletions(-)
 create mode 100644 trunk/include/linux/kmemtrace.h
 rename trunk/include/trace/{kmemtrace.h => kmem.h} (78%)

diff --git a/[refs] b/[refs]
index 8a5e431b2626..fcfbc6741f5a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: abd41443ac76d3e9c29a8c1d9e9a3312306cc55e
+refs/heads/master: 02af61bb50f5d5f0322dbe5ab2a0d75808d25c7b
diff --git a/trunk/include/linux/kmemtrace.h b/trunk/include/linux/kmemtrace.h
new file mode 100644
index 000000000000..15c45a27a925
--- /dev/null
+++ b/trunk/include/linux/kmemtrace.h
@@ -0,0 +1,25 @@
+/*
+ * 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 <trace/kmem.h>
+
+#ifdef CONFIG_KMEMTRACE
+extern void kmemtrace_init(void);
+#else
+static inline void kmemtrace_init(void)
+{
+}
+#endif
+
+#endif /* __KERNEL__ */
+
+#endif /* _LINUX_KMEMTRACE_H */
+
diff --git a/trunk/include/linux/slab_def.h b/trunk/include/linux/slab_def.h
index 5ac9b0bcaf9a..713f841ecaa9 100644
--- a/trunk/include/linux/slab_def.h
+++ b/trunk/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 <trace/kmemtrace.h>
+#include <linux/kmemtrace.h>
 
 /* Size description struct for general caches. */
 struct cache_sizes {
diff --git a/trunk/include/linux/slub_def.h b/trunk/include/linux/slub_def.h
index 5046f90c1171..be5d40c43bd2 100644
--- a/trunk/include/linux/slub_def.h
+++ b/trunk/include/linux/slub_def.h
@@ -10,7 +10,7 @@
 #include <linux/gfp.h>
 #include <linux/workqueue.h>
 #include <linux/kobject.h>
-#include <trace/kmemtrace.h>
+#include <linux/kmemtrace.h>
 
 enum stat_item {
 	ALLOC_FASTPATH,		/* Allocation from cpu slab */
diff --git a/trunk/include/trace/kmemtrace.h b/trunk/include/trace/kmem.h
similarity index 78%
rename from trunk/include/trace/kmemtrace.h
rename to trunk/include/trace/kmem.h
index 28ee69f9cd46..24d251928182 100644
--- a/trunk/include/trace/kmemtrace.h
+++ b/trunk/include/trace/kmem.h
@@ -1,25 +1,9 @@
-/*
- * Copyright (C) 2008 Eduard - Gabriel Munteanu
- *
- * This file is released under GPL version 2.
- */
-
-#ifndef _LINUX_KMEMTRACE_H
-#define _LINUX_KMEMTRACE_H
-
-#ifdef __KERNEL__
+#ifndef _TRACE_KMEM_H
+#define _TRACE_KMEM_H
 
 #include <linux/tracepoint.h>
 #include <linux/types.h>
 
-#ifdef CONFIG_KMEMTRACE
-extern void kmemtrace_init(void);
-#else
-static inline void kmemtrace_init(void)
-{
-}
-#endif
-
 DECLARE_TRACE(kmalloc,
 	      TP_PROTO(unsigned long call_site,
 		      const void *ptr,
@@ -57,7 +41,4 @@ DECLARE_TRACE(kmem_cache_free,
 	      TP_PROTO(unsigned long call_site, const void *ptr),
 	      TP_ARGS(call_site, ptr));
 
-#endif /* __KERNEL__ */
-
-#endif /* _LINUX_KMEMTRACE_H */
-
+#endif /* _TRACE_KMEM_H */
diff --git a/trunk/init/main.c b/trunk/init/main.c
index 3585f073d636..eece40cd8a64 100644
--- a/trunk/init/main.c
+++ b/trunk/init/main.c
@@ -64,6 +64,7 @@
 #include <linux/idr.h>
 #include <linux/ftrace.h>
 #include <linux/async.h>
+#include <linux/kmemtrace.h>
 #include <trace/boot.h>
 
 #include <asm/io.h>
@@ -71,7 +72,6 @@
 #include <asm/setup.h>
 #include <asm/sections.h>
 #include <asm/cacheflush.h>
-#include <trace/kmemtrace.h>
 
 #ifdef CONFIG_X86_LOCAL_APIC
 #include <asm/smp.h>
diff --git a/trunk/kernel/trace/kmemtrace.c b/trunk/kernel/trace/kmemtrace.c
index 5011f4d91e37..7a0aa0e260db 100644
--- a/trunk/kernel/trace/kmemtrace.c
+++ b/trunk/kernel/trace/kmemtrace.c
@@ -12,7 +12,7 @@
 #include <linux/dcache.h>
 #include <linux/fs.h>
 
-#include <trace/kmemtrace.h>
+#include <linux/kmemtrace.h>
 
 #include "trace_output.h"
 #include "trace.h"
diff --git a/trunk/kernel/trace/trace.h b/trunk/kernel/trace/trace.h
index f76a8f8689d4..34b94c3f40ad 100644
--- a/trunk/kernel/trace/trace.h
+++ b/trunk/kernel/trace/trace.h
@@ -9,7 +9,7 @@
 #include <linux/mmiotrace.h>
 #include <linux/ftrace.h>
 #include <trace/boot.h>
-#include <trace/kmemtrace.h>
+#include <linux/kmemtrace.h>
 #include <trace/power.h>
 
 enum trace_type {
diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c
index 9a90b00d2f91..f85831da9080 100644
--- a/trunk/mm/slab.c
+++ b/trunk/mm/slab.c
@@ -102,7 +102,7 @@
 #include	<linux/cpu.h>
 #include	<linux/sysctl.h>
 #include	<linux/module.h>
-#include	<trace/kmemtrace.h>
+#include	<linux/kmemtrace.h>
 #include	<linux/rcupdate.h>
 #include	<linux/string.h>
 #include	<linux/uaccess.h>
diff --git a/trunk/mm/slob.c b/trunk/mm/slob.c
index a2d4ab32198d..494f05f19417 100644
--- a/trunk/mm/slob.c
+++ b/trunk/mm/slob.c
@@ -65,7 +65,7 @@
 #include <linux/module.h>
 #include <linux/rcupdate.h>
 #include <linux/list.h>
-#include <trace/kmemtrace.h>
+#include <linux/kmemtrace.h>
 #include <asm/atomic.h>
 
 /*
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
index 7ab54ecbd3f3..ea9e7160e2e7 100644
--- a/trunk/mm/slub.c
+++ b/trunk/mm/slub.c
@@ -16,7 +16,7 @@
 #include <linux/slab.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
-#include <trace/kmemtrace.h>
+#include <linux/kmemtrace.h>
 #include <linux/cpu.h>
 #include <linux/cpuset.h>
 #include <linux/mempolicy.h>