* [PATCH] tracing/mm: Move include of trace/events/kmem.h out of header into slab.c
@ 2012-01-09 22:15 Steven Rostedt
2012-01-09 22:21 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Steven Rostedt @ 2012-01-09 22:15 UTC (permalink / raw)
To: LKML
Cc: Stephen Rothwell, Greg KH, Kay Sievers, Andrew Morton,
Frederic Weisbecker, Ingo Molnar, linux-next, David Miller,
Linus
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>
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 <asm/cache.h> /* kmalloc_sizes.h needs L1_CACHE_BYTES */
#include <linux/compiler.h>
-#include <trace/events/kmem.h>
-
/*
* 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 <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).
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] tracing/mm: Move include of trace/events/kmem.h out of header into slab.c
2012-01-09 22:15 [PATCH] tracing/mm: Move include of trace/events/kmem.h out of header into slab.c Steven Rostedt
@ 2012-01-09 22:21 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2012-01-09 22:21 UTC (permalink / raw)
To: rostedt
Cc: linux-kernel, sfr, greg, kay.sievers, akpm, fweisbec, mingo,
linux-next, torvalds
From: Steven Rostedt <rostedt@goodmis.org>
Date: Mon, 09 Jan 2012 17:15:42 -0500
> 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>
Acked-by: David S. Miller <davem@davemloft.net>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2012-01-09 22:23 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-01-09 22:15 [PATCH] tracing/mm: Move include of trace/events/kmem.h out of header into slab.c Steven Rostedt
2012-01-09 22:21 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).