Skip to contentSkip to conversation

kmemtrace: define tracepoints when CONFIG_TRACEPOINTS is enabled

PATCH In review Pekka Enberg 1 participant 2 messages Mar 24, 2009

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kmemtrace: define tracepoints when CONFIG_TRACEPOINTS is enabled

From: Pekka Enberg <[email protected]>

Impact: fix build

If CONFIG_KMEMTRACE is disabled but CONFIG_TRACEPOINTS is enabled, we need to define the tracepoints; otherwise linkage fails:

LD .tmp_vmlinux1
arch/x86/kernel/built-in.o: In function `sys_ioperm':
(.text+0x3743): undefined reference to __tracepoint_kmalloc' arch/x86/kernel/built-in.o: In function sys_ioperm':
(.text+0x3784): undefined reference to __tracepoint_kmalloc' arch/x86/kernel/built-in.o: In function cache_sysfs_init':
intel_cacheinfo.c:(.cpuinit.text+0x5f3): undefined reference to __tracepoint_kmalloc' intel_cacheinfo.c:(.cpuinit.text+0x768): undefined reference to __tracepoint_kmalloc' arch/x86/mm/built-in.o: In function `reserve_memtype':
(.text+0x2fb3): undefined reference to `__tracepoint_kmalloc'

Cc Eduard - Gabriel Munteanu <[email protected]>
---
 kernel/trace/kmemtrace.c |   15 ---------------
 mm/util.c                |   16 ++++++++++++++++
 2 files changed, 16 insertions(+), 15 deletions(-)
kernel/trace/kmemtrace.c +0 -15
index 53b9c7c..5011f4d 100644
@@ -17,21 +17,6 @@
 #include "trace_output.h"
 #include "trace.h"
 
-/* Tracepoints definitions. */
-DEFINE_TRACE(kmalloc);
-DEFINE_TRACE(kmem_cache_alloc);
-DEFINE_TRACE(kmalloc_node);
-DEFINE_TRACE(kmem_cache_alloc_node);
-DEFINE_TRACE(kfree);
-DEFINE_TRACE(kmem_cache_free);
-
-EXPORT_TRACEPOINT_SYMBOL(kmalloc);
-EXPORT_TRACEPOINT_SYMBOL(kmem_cache_alloc);
-EXPORT_TRACEPOINT_SYMBOL(kmalloc_node);
-EXPORT_TRACEPOINT_SYMBOL(kmem_cache_alloc_node);
-EXPORT_TRACEPOINT_SYMBOL(kfree);
-EXPORT_TRACEPOINT_SYMBOL(kmem_cache_free);
-
 /* Select an alternative, minimalistic output than the original one */
 #define TRACE_KMEM_OPT_MINIMAL	0x1
 
mm/util.c +16 -0
index 37eaccd..8d4b900 100644
@@ -4,6 +4,7 @@
 #include <linux/module.h>
 #include <linux/err.h>
 #include <linux/sched.h>
+#include <linux/tracepoint.h>
 #include <asm/uaccess.h>
 
 /**
@@ -206,3 +207,18 @@ int __attribute__((weak)) get_user_pages_fast(unsigned long start,
 	return ret;
 }
 EXPORT_SYMBOL_GPL(get_user_pages_fast);
+
+/* Tracepoints definitions. */
+DEFINE_TRACE(kmalloc);
+DEFINE_TRACE(kmem_cache_alloc);
+DEFINE_TRACE(kmalloc_node);
+DEFINE_TRACE(kmem_cache_alloc_node);
+DEFINE_TRACE(kfree);
+DEFINE_TRACE(kmem_cache_free);
+
+EXPORT_TRACEPOINT_SYMBOL(kmalloc);
+EXPORT_TRACEPOINT_SYMBOL(kmem_cache_alloc);
+EXPORT_TRACEPOINT_SYMBOL(kmalloc_node);
+EXPORT_TRACEPOINT_SYMBOL(kmem_cache_alloc_node);
+EXPORT_TRACEPOINT_SYMBOL(kfree);
+EXPORT_TRACEPOINT_SYMBOL(kmem_cache_free);
Signature · 1 line
1.5.4.3
#1 lore raw
Commit-ID:  676a628ddd84753eaba571146e081f98d9a4c757
Gitweb:     http://git.kernel.org/tip/676a628ddd84753eaba571146e081f98d9a4c757
Author:     Pekka Enberg <[email protected]>
AuthorDate: Tue, 24 Mar 2009 15:40:17 +0200
Committer:  Ingo Molnar <[email protected]>
CommitDate: Tue, 24 Mar 2009 14:59:05 +0100

kmemtrace: define tracepoints when CONFIG_TRACEPOINTS is enabled

Impact: fix build

If CONFIG_KMEMTRACE is disabled but CONFIG_TRACEPOINTS is enabled, we need to define the tracepoints; otherwise linkage fails:

LD .tmp_vmlinux1
arch/x86/kernel/built-in.o: In function `sys_ioperm':
(.text+0x3743): undefined reference to __tracepoint_kmalloc' arch/x86/kernel/built-in.o: In function sys_ioperm':
(.text+0x3784): undefined reference to __tracepoint_kmalloc' arch/x86/kernel/built-in.o: In function cache_sysfs_init':
intel_cacheinfo.c:(.cpuinit.text+0x5f3): undefined reference to __tracepoint_kmalloc' intel_cacheinfo.c:(.cpuinit.text+0x768): undefined reference to __tracepoint_kmalloc' arch/x86/mm/built-in.o: In function `reserve_memtype':
(.text+0x2fb3): undefined reference to `__tracepoint_kmalloc'

Cc Eduard - Gabriel Munteanu <[email protected]>

LKML-Reference: <1237902017.25315.90.camel@penberg-laptop>

---
 kernel/trace/kmemtrace.c |   15 ---------------
 mm/util.c                |   16 ++++++++++++++++
 2 files changed, 16 insertions(+), 15 deletions(-)
kernel/trace/kmemtrace.c +0 -15
index 53b9c7c..5011f4d 100644
@@ -17,21 +17,6 @@
 #include "trace_output.h"
 #include "trace.h"
 
-/* Tracepoints definitions. */
-DEFINE_TRACE(kmalloc);
-DEFINE_TRACE(kmem_cache_alloc);
-DEFINE_TRACE(kmalloc_node);
-DEFINE_TRACE(kmem_cache_alloc_node);
-DEFINE_TRACE(kfree);
-DEFINE_TRACE(kmem_cache_free);
-
-EXPORT_TRACEPOINT_SYMBOL(kmalloc);
-EXPORT_TRACEPOINT_SYMBOL(kmem_cache_alloc);
-EXPORT_TRACEPOINT_SYMBOL(kmalloc_node);
-EXPORT_TRACEPOINT_SYMBOL(kmem_cache_alloc_node);
-EXPORT_TRACEPOINT_SYMBOL(kfree);
-EXPORT_TRACEPOINT_SYMBOL(kmem_cache_free);
-
 /* Select an alternative, minimalistic output than the original one */
 #define TRACE_KMEM_OPT_MINIMAL	0x1
 
mm/util.c +16 -0
index 37eaccd..8d4b900 100644
@@ -4,6 +4,7 @@
 #include <linux/module.h>
 #include <linux/err.h>
 #include <linux/sched.h>
+#include <linux/tracepoint.h>
 #include <asm/uaccess.h>
 
 /**
@@ -206,3 +207,18 @@ int __attribute__((weak)) get_user_pages_fast(unsigned long start,
 	return ret;
 }
 EXPORT_SYMBOL_GPL(get_user_pages_fast);
+
+/* Tracepoints definitions. */
+DEFINE_TRACE(kmalloc);
+DEFINE_TRACE(kmem_cache_alloc);
+DEFINE_TRACE(kmalloc_node);
+DEFINE_TRACE(kmem_cache_alloc_node);
+DEFINE_TRACE(kfree);
+DEFINE_TRACE(kmem_cache_free);
+
+EXPORT_TRACEPOINT_SYMBOL(kmalloc);
+EXPORT_TRACEPOINT_SYMBOL(kmem_cache_alloc);
+EXPORT_TRACEPOINT_SYMBOL(kmalloc_node);
+EXPORT_TRACEPOINT_SYMBOL(kmem_cache_alloc_node);
+EXPORT_TRACEPOINT_SYMBOL(kfree);
+EXPORT_TRACEPOINT_SYMBOL(kmem_cache_free);