瀏覽代碼

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>
Steven Rostedt 13 年之前
父節點
當前提交
4dee6b64ee
共有 2 個文件被更改,包括 2 次插入2 次删除
  1. 0 2
      include/linux/slab_def.h
  2. 2 0
      mm/slab.c

+ 0 - 2
include/linux/slab_def.h

@@ -15,8 +15,6 @@
 #include <asm/cache.h>		/* kmalloc_sizes.h needs L1_CACHE_BYTES */
 #include <asm/cache.h>		/* kmalloc_sizes.h needs L1_CACHE_BYTES */
 #include <linux/compiler.h>
 #include <linux/compiler.h>
 
 
-#include <trace/events/kmem.h>
-
 /*
 /*
  * struct kmem_cache
  * struct kmem_cache
  *
  *

+ 2 - 0
mm/slab.c

@@ -121,6 +121,8 @@
 #include	<asm/tlbflush.h>
 #include	<asm/tlbflush.h>
 #include	<asm/page.h>
 #include	<asm/page.h>
 
 
+#include <trace/events/kmem.h>
+
 /*
 /*
  * DEBUG	- 1 for kmem_cache_create() to honour; SLAB_RED_ZONE & SLAB_POISON.
  * DEBUG	- 1 for kmem_cache_create() to honour; SLAB_RED_ZONE & SLAB_POISON.
  *		  0 for faster, smaller code (especially in the critical paths).
  *		  0 for faster, smaller code (especially in the critical paths).