From 4dee6b64ee7cfef94b47733c6d9fef07f8051c7c Mon Sep 17 00:00:00 2001 From: Steven Rostedt Date: Mon, 9 Jan 2012 17:15:42 -0500 Subject: tracing/mm: Move include of trace/events/kmem.h out of header into slab.c Including trace/events/*.h TRACE_EVENT() macro headers in other headers can cause strange side effects if another trace/event/*.h header includes that header. Having trace/events/kmem.h inside slab_def.h caused a compile error in sparc64 when changes were done to some header files. Moving the kmem.h trace header out of slab.h and into slab.c fixes the problem. Note, both slub.c and slob.c already include the trace/events/kmem.h file. Only slab.c had it missing. Link: http://lkml.kernel.org/r/20120105190405.1e3191fb5a43b2a0f1655e1f@canb.auug.org.au Reported-by: Stephen Rothwell Signed-off-by: Steven Rostedt Signed-off-by: Linus Torvalds --- include/linux/slab_def.h | 2 -- mm/slab.c | 2 ++ 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/linux/slab_def.h b/include/linux/slab_def.h index d00e0ba..fbd1117 100644 --- a/include/linux/slab_def.h +++ b/include/linux/slab_def.h @@ -15,8 +15,6 @@ #include /* kmalloc_sizes.h needs L1_CACHE_BYTES */ #include -#include - /* * struct kmem_cache * diff --git a/mm/slab.c b/mm/slab.c index 83311c9a..2acfa0d 100644 --- a/mm/slab.c +++ b/mm/slab.c @@ -121,6 +121,8 @@ #include #include +#include + /* * DEBUG - 1 for kmem_cache_create() to honour; SLAB_RED_ZONE & SLAB_POISON. * 0 for faster, smaller code (especially in the critical paths). -- cgit v1.1