From bf0e174c0b2d7ed072d74d2b66b70b9f4318cae5 Mon Sep 17 00:00:00 2001
From: Ingo Molnar <mingo@elte.hu>
Date: Mon, 29 Dec 2008 15:29:04 +0100
Subject: [PATCH] --- yaml --- r: 140591 b: refs/heads/master c:
 2a38b1c4f123afa4579cb1d29380b337e9195cbb h: refs/heads/master i:   140589:
 c554a481747ea0f1a59ae743300ef5a2a552964e   140587:
 61a84dc72e3ba4f71e035e48738c5cfc9dd4df76   140583:
 1a5b4b4cf7f7faadb279dd30cad36483803175be   140575:
 338bd60f3977a62f57f550b2a063c9c3048a7e9b v: v3

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

diff --git a/[refs] b/[refs]
index 5651300b7245..b8cebb21238e 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ff9f9d9629bf9530fe2ab8d803d612761ffc059
+refs/heads/master: 2a38b1c4f123afa4579cb1d29380b337e9195cbb
diff --git a/trunk/mm/slab.c b/trunk/mm/slab.c
index b6d9b8cdefa9..bcf08ea88380 100644
--- a/trunk/mm/slab.c
+++ b/trunk/mm/slab.c
@@ -102,6 +102,7 @@
 #include	<linux/cpu.h>
 #include	<linux/sysctl.h>
 #include	<linux/module.h>
+#include	<linux/kmemtrace.h>
 #include	<linux/rcupdate.h>
 #include	<linux/string.h>
 #include	<linux/uaccess.h>
@@ -112,7 +113,6 @@
 #include	<linux/rtmutex.h>
 #include	<linux/reciprocal_div.h>
 #include	<linux/debugobjects.h>
-#include	<linux/kmemtrace.h>
 
 #include	<asm/cacheflush.h>
 #include	<asm/tlbflush.h>
diff --git a/trunk/mm/slub.c b/trunk/mm/slub.c
index 4cd7bfd2ab2c..cc4001fee7ac 100644
--- a/trunk/mm/slub.c
+++ b/trunk/mm/slub.c
@@ -16,6 +16,7 @@
 #include <linux/slab.h>
 #include <linux/proc_fs.h>
 #include <linux/seq_file.h>
+#include <linux/kmemtrace.h>
 #include <linux/cpu.h>
 #include <linux/cpuset.h>
 #include <linux/mempolicy.h>
@@ -24,7 +25,6 @@
 #include <linux/kallsyms.h>
 #include <linux/memory.h>
 #include <linux/math64.h>
-#include <linux/kmemtrace.h>
 
 /*
  * Lock order: