Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02af61bb authored by Zhaolei's avatar Zhaolei Committed by Ingo Molnar
Browse files

tracing, kmemtrace: Separate include/trace/kmemtrace.h to kmemtrace part and tracepoint part 



Impact: refactor code for future changes

Current kmemtrace.h is used both as header file of kmemtrace and kmem's
tracepoints definition.

Tracepoints' definition file may be used by other code, and should only have
definition of tracepoint.

We can separate include/trace/kmemtrace.h into 2 files:

  include/linux/kmemtrace.h: header file for kmemtrace
  include/trace/kmem.h:      definition of kmem tracepoints

Signed-off-by: default avatarZhao Lei <zhaolei@cn.fujitsu.com>
Acked-by: default avatarEduard - Gabriel Munteanu <eduard.munteanu@linux360.ro>
Acked-by: default avatarPekka Enberg <penberg@cs.helsinki.fi>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <49DEE68A.5040902@cn.fujitsu.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent abd41443

include/linux/kmemtrace.h

0 → 100644
+25 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2008 Eduard - Gabriel Munteanu

 *

 * This file is released under GPL version 2.

 */



#ifndef _LINUX_KMEMTRACE_H

#define _LINUX_KMEMTRACE_H



#ifdef __KERNEL__



#include <trace/kmem.h>



#ifdef CONFIG_KMEMTRACE

extern void kmemtrace_init(void);

#else

static inline void kmemtrace_init(void)

{

}

#endif



#endif /* __KERNEL__ */



#endif /* _LINUX_KMEMTRACE_H */

include/linux/slab_def.h

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#include <asm/page.h>		/* kmalloc_sizes.h needs PAGE_SIZE */

#include <asm/cache.h>		/* kmalloc_sizes.h needs L1_CACHE_BYTES */

#include <linux/compiler.h>

#include <trace/kmemtrace.h>

#include <linux/kmemtrace.h>



/* Size description struct for general caches. */

struct cache_sizes {

include/linux/slub_def.h

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
#include <linux/gfp.h>

#include <linux/workqueue.h>

#include <linux/kobject.h>

#include <trace/kmemtrace.h>

#include <linux/kmemtrace.h>



enum stat_item {

	ALLOC_FASTPATH,		/* Allocation from cpu slab */

include/trace/kmemtrace.h→include/trace/kmem.h

+3 −22
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2008 Eduard - Gabriel Munteanu

 *

 * This file is released under GPL version 2.

 */



#ifndef _LINUX_KMEMTRACE_H

#define _LINUX_KMEMTRACE_H



#ifdef __KERNEL__

#ifndef _TRACE_KMEM_H

#define _TRACE_KMEM_H



#include <linux/tracepoint.h>

#include <linux/types.h>



#ifdef CONFIG_KMEMTRACE

extern void kmemtrace_init(void);

#else

static inline void kmemtrace_init(void)

{

}

#endif



DECLARE_TRACE(kmalloc,

	      TP_PROTO(unsigned long call_site,

		      const void *ptr,
@@ -57,7 +41,4 @@ DECLARE_TRACE(kmem_cache_free, 
	      TP_PROTO(unsigned long call_site, const void *ptr),

	      TP_ARGS(call_site, ptr));



#endif /* __KERNEL__ */



#endif /* _LINUX_KMEMTRACE_H */

#endif /* _TRACE_KMEM_H */

init/main.c

+1 −1
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ 
#include <linux/idr.h>

#include <linux/ftrace.h>

#include <linux/async.h>

#include <linux/kmemtrace.h>

#include <trace/boot.h>



#include <asm/io.h>
@@ -71,7 +72,6 @@ 
#include <asm/setup.h>

#include <asm/sections.h>

#include <asm/cacheflush.h>

#include <trace/kmemtrace.h>



#ifdef CONFIG_X86_LOCAL_APIC

#include <asm/smp.h>