Commit 4dee6b64 authored Jan 09, 2012 by Steven Rostedt Committed by Linus Torvalds Jan 09, 2012

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 <sfr@canb.auug.org.au>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

parent 6b3da11b

include/linux/slab_def.h

+0 −2

Original line number	Diff line number	Diff line
		@@ -15,8 +15,6 @@
		#include <asm/cache.h> /* kmalloc_sizes.h needs L1_CACHE_BYTES */
		#include <linux/compiler.h>

		#include <trace/events/kmem.h>

		/*
		* struct kmem_cache
		*

mm/slab.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -121,6 +121,8 @@
		#include <asm/tlbflush.h>
		#include <asm/page.h>

		#include <trace/events/kmem.h>

		/*
		* DEBUG - 1 for kmem_cache_create() to honour; SLAB_RED_ZONE & SLAB_POISON.
		* 0 for faster, smaller code (especially in the critical paths).

Admin message