summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-29 17:29:04 +0300
committerIngo Molnar <mingo@elte.hu>2008-12-30 08:56:21 +0300
commit2a38b1c4f123afa4579cb1d29380b337e9195cbb (patch)
treecd99077aa83cd521c831aa3157e058eb4125e0c7
parent2ff9f9d9629bf9530fe2ab8d803d612761ffc059 (diff)
downloadlinux-2a38b1c4f123afa4579cb1d29380b337e9195cbb.tar.xz
kmemtrace: move #include lines
Impact: avoid conflicts with kmemcheck kmemcheck modifies the same area of slab.c and slub.c - move the include lines up a bit. Signed-off-by: Ingo Molnar <mingo@elte.hu>
-rw-r--r--mm/slab.c2
-rw-r--r--mm/slub.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/mm/slab.c b/mm/slab.c
index b6d9b8cdefa9..bcf08ea88380 100644
--- a/mm/slab.c
+++ b/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/mm/slub.c b/mm/slub.c
index 4cd7bfd2ab2c..cc4001fee7ac 100644
--- a/mm/slub.c
+++ b/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: