---

yaml --- r: 140591 b: refs/heads/master c: 2a38b1c h: refs/heads/master i: 140589: c554a48 140587: 61a84dc 140583: 1a5b4b4 140575: 338bd60 v: v3
git-mirror · Dec 30, 2008 · bf0e174 · bf0e174
1 parent 8a0d909
commit bf0e174
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git 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
@@ -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
@@ -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: