From: Steven Rostedt <rostedt@goodmis.org>
To: Will Deacon <will.deacon@arm.com>
Cc: "Geert Uytterhoeven" <geert@linux-m68k.org>,
"AKASHI Takahiro" <takahiro.akashi@linaro.org>,
"Frédéric Weisbecker" <fweisbec@gmail.com>,
"Ingo Molnar" <mingo@redhat.com>,
"Catalin Marinas" <catalin.marinas@arm.com>,
tim.bird@sonymobile.com, gkulkarni@caviumnetworks.com,
dsaxena@linaro.org, arndb@arndb.de,
"linux-arm-kernel@lists.infradead.org"
<linux-arm-kernel@lists.infradead.org>,
linaro-kernel <linaro-kernel@lists.linaro.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"Linux-sh list" <linux-sh@vger.kernel.org>
Subject: [PATCH] arm/ftrace: Fix function_return_addr() to function_return_address()
Date: Wed, 11 Jun 2014 09:23:30 -0400 [thread overview]
Message-ID: <20140611092330.7930eff2@gandalf.local.home> (raw)
In-Reply-To: <CAMuHMdWs9i4pBNbn-RTpv_-K5W7YGED=KtEtFSci=7YHdNKpfw@mail.gmail.com>
The clean up of CALLER_ADDR*() functions required the archs to either
use the default __builtin_return_address(X) (where X > 0) or override
it with something the arch can use. To override it, the arch would
define function_return_address(x).
The arm architecture requires this to be redefined but instead of
defining function_return_address(x) it defined function_return_addr(x).
Reported-by: Geert Uytterhoeven <geert@linux-m68k.org>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
----
diff --git a/arch/arm/include/asm/ftrace.h b/arch/arm/include/asm/ftrace.h
index eb577f4..39eb16b 100644
--- a/arch/arm/include/asm/ftrace.h
+++ b/arch/arm/include/asm/ftrace.h
@@ -52,7 +52,7 @@ extern inline void *return_address(unsigned int level)
#endif
-#define ftrace_return_addr(n) return_address(n)
+#define ftrace_return_address(n) return_address(n)
#endif /* ifndef __ASSEMBLY__ */
next prev parent reply other threads:[~2014-06-11 13:23 UTC|newest]
Thread overview: 112+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <1382598488-13511-1-git-send-email-takahiro.akashi@linaro.org>
2014-02-07 10:18 ` [PATCH v3 0/6] arm64: Add ftrace support AKASHI Takahiro
2014-02-07 10:18 ` [PATCH v3 1/6] " AKASHI Takahiro
2014-02-10 15:03 ` Arnd Bergmann
2014-02-10 15:19 ` Steven Rostedt
[not found] ` <CAB5YjtCr2KL_q1FF8kO_VKe+feg7f9qFRKtwf3xj2h0ENwuB5g@mail.gmail.com>
2014-02-12 11:03 ` Arnd Bergmann
2014-02-17 18:12 ` Will Deacon
2014-02-19 10:46 ` AKASHI Takahiro
2014-02-07 10:18 ` [PATCH v3 2/6] arm64: ftrace: Add dynamic " AKASHI Takahiro
2014-02-07 10:18 ` [PATCH v3 3/6] arm64: ftrace: Add CALLER_ADDRx macros AKASHI Takahiro
2014-02-07 10:18 ` [PATCH v3 4/6] ftrace: Add arm64 support to recordmcount AKASHI Takahiro
2014-02-07 10:18 ` [PATCH v3 5/6] arm64: ftrace: Add system call tracepoint AKASHI Takahiro
2014-02-17 19:29 ` Will Deacon
2014-02-19 10:48 ` AKASHI Takahiro
2014-02-07 10:18 ` [PATCH v3 6/6] arm64: Add 'notrace' attribute to unwind_frame() for ftrace AKASHI Takahiro
2014-02-10 14:21 ` [PATCH v3 0/6] arm64: Add ftrace support Kulkarni, Ganapatrao
2014-02-25 9:23 ` [PATCH v4 0/7] " AKASHI Takahiro
2014-02-25 9:23 ` [PATCH v4 1/7] " AKASHI Takahiro
2014-02-25 15:38 ` Kulkarni, Ganapatrao
2014-02-28 5:06 ` AKASHI Takahiro
2014-02-25 9:23 ` [PATCH v4 2/7] arm64: ftrace: Add dynamic " AKASHI Takahiro
2014-02-25 9:23 ` [PATCH v4 3/7] arm64: ftrace: Add CALLER_ADDRx macros AKASHI Takahiro
2014-02-25 9:23 ` [PATCH v4 4/7] ftrace: Add arm64 support to recordmcount AKASHI Takahiro
2014-02-25 9:23 ` [PATCH v4 5/7] arm64: ftrace: Add system call tracepoint AKASHI Takahiro
2014-02-25 9:23 ` [PATCH v4 6/7] arm64: Add 'notrace' attribute to unwind_frame() for ftrace AKASHI Takahiro
2014-02-25 9:23 ` [PATCH v4 7/7] arm64: add __ASSEMBLY__ in asm/insn.h AKASHI Takahiro
2014-02-28 5:18 ` [PATCH v5 0/7] arm64: Add ftrace support AKASHI Takahiro
2014-02-28 5:18 ` [PATCH v5 1/7] " AKASHI Takahiro
2014-02-28 5:18 ` [PATCH v5 2/7] arm64: ftrace: Add dynamic " AKASHI Takahiro
2014-02-28 5:18 ` [PATCH v5 3/7] arm64: ftrace: Add CALLER_ADDRx macros AKASHI Takahiro
2014-02-28 5:18 ` [PATCH v5 4/7] ftrace: Add arm64 support to recordmcount AKASHI Takahiro
2014-02-28 5:18 ` [PATCH v5 5/7] arm64: ftrace: Add system call tracepoint AKASHI Takahiro
2014-02-28 5:18 ` [PATCH v5 6/7] arm64: Add 'notrace' attribute to unwind_frame() for ftrace AKASHI Takahiro
2014-02-28 5:18 ` [PATCH v5 7/7] arm64: add __ASSEMBLY__ in asm/insn.h AKASHI Takahiro
2014-03-11 14:35 ` [PATCH v5 0/7] arm64: Add ftrace support Will Deacon
2014-03-12 1:47 ` AKASHI Takahiro
2014-03-12 1:58 ` Steven Rostedt
2014-03-12 2:02 ` Steven Rostedt
2014-03-13 10:13 ` [PATCH v6 " AKASHI Takahiro
2014-03-13 10:13 ` [PATCH v6 1/7] arm64: add __ASSEMBLY__ in asm/insn.h AKASHI Takahiro
2014-03-13 12:19 ` Will Deacon
2014-03-13 10:13 ` [PATCH v6 2/7] arm64: Add 'notrace' attribute to unwind_frame() for ftrace AKASHI Takahiro
2014-03-13 12:19 ` Will Deacon
2014-03-13 10:13 ` [PATCH v6 3/7] ftrace: Add arm64 support to recordmcount AKASHI Takahiro
2014-03-13 12:38 ` Will Deacon
2014-03-13 14:57 ` AKASHI Takahiro
2014-03-13 16:05 ` Will Deacon
2014-03-13 10:13 ` [PATCH v6 4/7] arm64: Add ftrace support AKASHI Takahiro
2014-03-13 17:08 ` Will Deacon
2014-03-13 18:27 ` Steven Rostedt
2014-03-13 18:37 ` Will Deacon
2014-03-13 18:49 ` Steven Rostedt
2014-03-14 4:45 ` AKASHI Takahiro
2014-03-14 10:07 ` Will Deacon
2014-03-14 16:13 ` AKASHI Takahiro
2014-03-13 10:13 ` [PATCH v6 5/7] arm64: ftrace: Add dynamic " AKASHI Takahiro
2014-03-13 18:10 ` Will Deacon
2014-03-13 18:33 ` Steven Rostedt
2014-03-14 5:28 ` AKASHI Takahiro
2014-03-14 5:26 ` AKASHI Takahiro
2014-03-13 10:13 ` [PATCH v6 6/7] arm64: ftrace: Add CALLER_ADDRx macros AKASHI Takahiro
2014-03-13 15:54 ` Will Deacon
2014-03-13 18:07 ` Steven Rostedt
2014-03-14 4:55 ` AKASHI Takahiro
2014-03-14 3:00 ` AKASHI Takahiro
2014-03-14 10:09 ` Will Deacon
2014-03-14 16:15 ` AKASHI Takahiro
2014-03-13 10:13 ` [PATCH v6 7/7] arm64: ftrace: Add system call tracepoint AKASHI Takahiro
2014-03-13 16:25 ` Will Deacon
2014-03-14 3:50 ` AKASHI Takahiro
2014-03-15 5:40 ` [PATCH v7 0/7] arm64: Add ftrace support AKASHI Takahiro
2014-03-15 5:40 ` [PATCH v7 1/7] arm64: add __ASSEMBLY__ in asm/insn.h AKASHI Takahiro
2014-03-15 5:40 ` [PATCH v7 2/7] arm64: Add 'notrace' attribute to unwind_frame() for ftrace AKASHI Takahiro
2014-03-15 5:40 ` [PATCH v7 3/7] ftrace: Add arm64 support to recordmcount AKASHI Takahiro
2014-04-16 13:31 ` Will Deacon
2014-04-30 9:54 ` [PATCH v8 0/8] arm64: Add ftrace support AKASHI Takahiro
2014-04-30 9:54 ` [PATCH v8 1/8] ftrace: make CALLER_ADDRx macros more generic AKASHI Takahiro
2014-05-02 18:13 ` Will Deacon
2014-05-02 19:02 ` Steven Rostedt
2014-05-02 19:03 ` Steven Rostedt
2014-05-02 19:19 ` Steven Rostedt
2014-05-12 15:58 ` Will Deacon
2014-05-12 16:05 ` Steven Rostedt
2014-05-12 16:12 ` Will Deacon
2014-05-12 17:23 ` Steven Rostedt
2014-05-20 11:29 ` AKASHI Takahiro
2014-05-20 11:31 ` [PATCH v8_1] " AKASHI Takahiro
2014-06-11 12:34 ` [PATCH v8 1/8] " Geert Uytterhoeven
2014-06-11 13:23 ` Steven Rostedt [this message]
2014-06-11 13:38 ` [PATCH] arm/ftrace: Fix function_return_addr() to function_return_address() Geert Uytterhoeven
2014-06-11 13:44 ` Steven Rostedt
2014-04-30 9:54 ` [PATCH v8 2/8] arm64: add __ASSEMBLY__ in asm/insn.h AKASHI Takahiro
2014-04-30 9:54 ` [PATCH v8 3/8] arm64: Add 'notrace' attribute to unwind_frame() for ftrace AKASHI Takahiro
2014-04-30 9:54 ` [PATCH v8 4/8] ftrace: Add arm64 support to recordmcount AKASHI Takahiro
2014-04-30 9:54 ` [PATCH v8 5/8] arm64: Add ftrace support AKASHI Takahiro
2014-05-28 20:19 ` Mark Brown
2014-05-29 8:07 ` Will Deacon
2014-05-29 9:47 ` Mark Brown
2014-04-30 9:54 ` [PATCH v8 6/8] arm64: ftrace: Add dynamic " AKASHI Takahiro
2014-04-30 9:54 ` [PATCH v8 7/8] arm64: ftrace: Add CALLER_ADDRx macros AKASHI Takahiro
2014-04-30 9:54 ` [PATCH v8 8/8] arm64: ftrace: Add system call tracepoint AKASHI Takahiro
2014-03-15 5:45 ` [PATCH v7 4/7] arm64: Add ftrace support AKASHI Takahiro
2014-04-16 13:45 ` Will Deacon
2014-03-15 5:45 ` [PATCH v7 5/7] arm64: ftrace: Add dynamic " AKASHI Takahiro
2014-04-16 13:48 ` Will Deacon
2014-03-15 5:45 ` [PATCH v7 6/7] arm64: ftrace: Add CALLER_ADDRx macros AKASHI Takahiro
2014-04-16 13:52 ` Will Deacon
2014-04-28 10:41 ` AKASHI Takahiro
2014-05-27 13:10 ` [for-next][PATCH] ftrace: Make CALLER_ADDRx macros more generic Steven Rostedt
2014-05-27 18:49 ` Will Deacon
2014-05-29 5:27 ` AKASHI Takahiro
2014-05-29 8:10 ` Will Deacon
2014-03-15 5:45 ` [PATCH v7 7/7] arm64: ftrace: Add system call tracepoint AKASHI Takahiro
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20140611092330.7930eff2@gandalf.local.home \
--to=rostedt@goodmis.org \
--cc=arndb@arndb.de \
--cc=catalin.marinas@arm.com \
--cc=dsaxena@linaro.org \
--cc=fweisbec@gmail.com \
--cc=geert@linux-m68k.org \
--cc=gkulkarni@caviumnetworks.com \
--cc=linaro-kernel@lists.linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-sh@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=takahiro.akashi@linaro.org \
--cc=tim.bird@sonymobile.com \
--cc=will.deacon@arm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®