mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-07-16 22:38:04 +00:00
Koen Kooi
1af87d9126
3.2.16 is the final release in the 3.2-stable series by Greg KH. Signed-off-by: Koen Kooi <koen@dominion.thruhere.net> Signed-off-by: Denys Dmytriyenko <denys@ti.com>
78 lines
2.9 KiB
Diff
78 lines
2.9 KiB
Diff
From fea2076685048df406c2fc4d6542837a4306c6fd Mon Sep 17 00:00:00 2001
|
|
From: Wolfgang Mauerer <wolfgang.mauerer@siemens.com>
|
|
Date: Thu, 22 Mar 2012 11:18:20 +0100
|
|
Subject: [PATCH 20/60] tracing: Fix ftrace stack trace entries
|
|
|
|
commit 01de982abf8c9e10fc3089e10585cd2cc914bdab upstream.
|
|
|
|
8 hex characters tell only half the tale for 64 bit CPUs,
|
|
so use the appropriate length.
|
|
|
|
Link: http://lkml.kernel.org/r/1332411501-8059-2-git-send-email-wolfgang.mauerer@siemens.com
|
|
|
|
Signed-off-by: Wolfgang Mauerer <wolfgang.mauerer@siemens.com>
|
|
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
kernel/trace/trace_entries.h | 16 ++++++++++++----
|
|
kernel/trace/trace_export.c | 2 +-
|
|
2 files changed, 13 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/kernel/trace/trace_entries.h b/kernel/trace/trace_entries.h
|
|
index 9336590..205dcac 100644
|
|
--- a/kernel/trace/trace_entries.h
|
|
+++ b/kernel/trace/trace_entries.h
|
|
@@ -156,6 +156,12 @@ FTRACE_ENTRY_DUP(wakeup, ctx_switch_entry,
|
|
|
|
#define FTRACE_STACK_ENTRIES 8
|
|
|
|
+#ifndef CONFIG_64BIT
|
|
+# define IP_FMT "%08lx"
|
|
+#else
|
|
+# define IP_FMT "%016lx"
|
|
+#endif
|
|
+
|
|
FTRACE_ENTRY(kernel_stack, stack_entry,
|
|
|
|
TRACE_STACK,
|
|
@@ -165,8 +171,9 @@ FTRACE_ENTRY(kernel_stack, stack_entry,
|
|
__dynamic_array(unsigned long, caller )
|
|
),
|
|
|
|
- F_printk("\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n"
|
|
- "\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n",
|
|
+ F_printk("\t=> (" IP_FMT ")\n\t=> (" IP_FMT ")\n\t=> (" IP_FMT ")\n"
|
|
+ "\t=> (" IP_FMT ")\n\t=> (" IP_FMT ")\n\t=> (" IP_FMT ")\n"
|
|
+ "\t=> (" IP_FMT ")\n\t=> (" IP_FMT ")\n",
|
|
__entry->caller[0], __entry->caller[1], __entry->caller[2],
|
|
__entry->caller[3], __entry->caller[4], __entry->caller[5],
|
|
__entry->caller[6], __entry->caller[7])
|
|
@@ -181,8 +188,9 @@ FTRACE_ENTRY(user_stack, userstack_entry,
|
|
__array( unsigned long, caller, FTRACE_STACK_ENTRIES )
|
|
),
|
|
|
|
- F_printk("\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n"
|
|
- "\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n\t=> (%08lx)\n",
|
|
+ F_printk("\t=> (" IP_FMT ")\n\t=> (" IP_FMT ")\n\t=> (" IP_FMT ")\n"
|
|
+ "\t=> (" IP_FMT ")\n\t=> (" IP_FMT ")\n\t=> (" IP_FMT ")\n"
|
|
+ "\t=> (" IP_FMT ")\n\t=> (" IP_FMT ")\n",
|
|
__entry->caller[0], __entry->caller[1], __entry->caller[2],
|
|
__entry->caller[3], __entry->caller[4], __entry->caller[5],
|
|
__entry->caller[6], __entry->caller[7])
|
|
diff --git a/kernel/trace/trace_export.c b/kernel/trace/trace_export.c
|
|
index bbeec31..ad4000c 100644
|
|
--- a/kernel/trace/trace_export.c
|
|
+++ b/kernel/trace/trace_export.c
|
|
@@ -150,7 +150,7 @@ ftrace_define_fields_##name(struct ftrace_event_call *event_call) \
|
|
#define __dynamic_array(type, item)
|
|
|
|
#undef F_printk
|
|
-#define F_printk(fmt, args...) #fmt ", " __stringify(args)
|
|
+#define F_printk(fmt, args...) __stringify(fmt) ", " __stringify(args)
|
|
|
|
#undef FTRACE_ENTRY
|
|
#define FTRACE_ENTRY(call, struct_name, etype, tstruct, print) \
|
|
--
|
|
1.7.9.5
|
|
|