Commit 2a38b1c4 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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: default avatarIngo Molnar <mingo@elte.hu>
parent 2ff9f9d9

mm/slab.c

+1 −1
Original line number Diff line number Diff line
@@ -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>

mm/slub.c

+1 −1
Original line number Diff line number Diff line
@@ -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: