aboutsummaryrefslogtreecommitdiffstats
path: root/mm/slab.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/slab.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/slab.c')
-rw-r--r--mm/slab.c2
1 files changed, 1 insertions, 1 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 @@
102#include <linux/cpu.h> 102#include <linux/cpu.h>
103#include <linux/sysctl.h> 103#include <linux/sysctl.h>
104#include <linux/module.h> 104#include <linux/module.h>
105#include <linux/kmemtrace.h>
105#include <linux/rcupdate.h> 106#include <linux/rcupdate.h>
106#include <linux/string.h> 107#include <linux/string.h>
107#include <linux/uaccess.h> 108#include <linux/uaccess.h>
@@ -112,7 +113,6 @@
112#include <linux/rtmutex.h> 113#include <linux/rtmutex.h>
113#include <linux/reciprocal_div.h> 114#include <linux/reciprocal_div.h>
114#include <linux/debugobjects.h> 115#include <linux/debugobjects.h>
115#include <linux/kmemtrace.h>
116 116
117#include <asm/cacheflush.h> 117#include <asm/cacheflush.h>
118#include <asm/tlbflush.h> 118#include <asm/tlbflush.h>