aboutsummaryrefslogtreecommitdiffstats
path: root/mm/slub.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-12-29 09:29:04 -0500
committerIngo Molnar <mingo@elte.hu>2008-12-30 00:56:21 -0500
commit2a38b1c4f123afa4579cb1d29380b337e9195cbb (patch)
treecd99077aa83cd521c831aa3157e058eb4125e0c7 /mm/slub.c
parent2ff9f9d9629bf9530fe2ab8d803d612761ffc059 (diff)
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>
Diffstat (limited to 'mm/slub.c')
-rw-r--r--mm/slub.c2
1 files changed, 1 insertions, 1 deletions
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 @@
16#include <linux/slab.h> 16#include <linux/slab.h>
17#include <linux/proc_fs.h> 17#include <linux/proc_fs.h>
18#include <linux/seq_file.h> 18#include <linux/seq_file.h>
19#include <linux/kmemtrace.h>
19#include <linux/cpu.h> 20#include <linux/cpu.h>
20#include <linux/cpuset.h> 21#include <linux/cpuset.h>
21#include <linux/mempolicy.h> 22#include <linux/mempolicy.h>
@@ -24,7 +25,6 @@
24#include <linux/kallsyms.h> 25#include <linux/kallsyms.h>
25#include <linux/memory.h> 26#include <linux/memory.h>
26#include <linux/math64.h> 27#include <linux/math64.h>
27#include <linux/kmemtrace.h>
28 28
29/* 29/*
30 * Lock order: 30 * Lock order: