From a39049d539eb0547c8a2cd17ae9c1b3fc8e43787 Mon Sep 17 00:00:00 2001
From: Steven Rostedt <rostedt@goodmis.org>
Date: Mon, 9 Jan 2012 17:15:42 -0500
Subject: [PATCH] --- yaml --- r: 281486 b: refs/heads/master c:
 4dee6b64ee7cfef94b47733c6d9fef07f8051c7c h: refs/heads/master v: v3

---
 [refs]                         | 2 +-
 trunk/include/linux/slab_def.h | 2 --
 trunk/mm/slab.c                | 2 ++
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index f7f1d147fcc6..b2a0b41de5de 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 6b3da11b3c36fdafce3a72e0e90d6c4e99e9aad5
+refs/heads/master: 4dee6b64ee7cfef94b47733c6d9fef07f8051c7c
diff --git a/trunk/include/linux/slab_def.h b/trunk/include/linux/slab_def.h
index d00e0bacda93..fbd1117fdfde 100644
--- a/trunk/include/linux/slab_def.h
+++ b/trunk/include/linux/slab_def.h
@@ -15,8 +15,6 @@
 #include <asm/cache.h>		/* kmalloc_sizes.h needs L1_CACHE_BYTES */
 #include <linux/compiler.h>
 
-#include <trace/events/kmem.h>
-
 /*
  * struct kmem_cache
  *
diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c
index 83311c9aaf9d..2acfa0d90943 100644
--- a/trunk/mm/slab.c
+++ b/trunk/mm/slab.c
@@ -121,6 +121,8 @@
 #include	<asm/tlbflush.h>
 #include	<asm/page.h>
 
+#include <trace/events/kmem.h>
+
 /*
  * DEBUG	- 1 for kmem_cache_create() to honour; SLAB_RED_ZONE & SLAB_POISON.
  *		  0 for faster, smaller code (especially in the critical paths).