From: rabin@rab.in (Rabin Vincent)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 05/10] ARM: ftrace: add ENDPROC annotations
Date: Thu, 22 Apr 2010 00:53:19 +0530 [thread overview]
Message-ID: <20100421192319.GA16719@debian> (raw)
In-Reply-To: <20100313084546.GA30400@n2100.arm.linux.org.uk>
On Sat, Mar 13, 2010 at 08:45:46AM +0000, Russell King - ARM Linux wrote:
> On Sat, Mar 13, 2010 at 12:19:42PM +0530, Rabin Vincent wrote:
> >
> > .globl ftrace_stub
> > -ftrace_stub:
> > +ENTRY(ftrace_stub)
>
> ENTRY does the .globl for you, so please kill your own version.
Updated patch below.
WARNING: multiple messages have this Message-ID (diff)
From: Rabin Vincent <rabin@rab.in>
To: Russell King - ARM Linux <linux@arm.linux.org.uk>
Cc: linux-kernel@vger.kernel.org,
"Abhishek Sagar" <sagar.abhishek@gmail.com>,
"Frederic Weisbecker" <fweisbec@gmail.com>,
"Steven Rostedt" <rostedt@goodmis.org>,
"Ingo Molnar" <mingo@redhat.com>,
"Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>,
linux-arm-kernel@lists.infradead.org
Subject: Re: [PATCH 05/10] ARM: ftrace: add ENDPROC annotations
Date: Thu, 22 Apr 2010 00:53:19 +0530 [thread overview]
Message-ID: <20100421192319.GA16719@debian> (raw)
In-Reply-To: <20100313084546.GA30400@n2100.arm.linux.org.uk>
On Sat, Mar 13, 2010 at 08:45:46AM +0000, Russell King - ARM Linux wrote:
> On Sat, Mar 13, 2010 at 12:19:42PM +0530, Rabin Vincent wrote:
> >
> > .globl ftrace_stub
> > -ftrace_stub:
> > +ENTRY(ftrace_stub)
>
> ENTRY does the .globl for you, so please kill your own version.
Updated patch below.
>From 87b70ed633da00fe9873a5819c6d24e57368de43 Mon Sep 17 00:00:00 2001
From: Rabin Vincent <rabin@rab.in>
Date: Sun, 14 Feb 2010 01:18:33 +0530
Subject: [PATCH] ARM: ftrace: add ENDPROC annotations
When building as Thumb-2, the ".type foo, %function" annotation in
ENDPROC seems to be required in order for the assembly routines to be
recognized as Thumb-2 code. If the ENDPROC annotations are not present,
calls to these routines are generated as BLX instead of BL.
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Rabin Vincent <rabin@rab.in>
---
arch/arm/kernel/entry-common.S | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
index 6805a72..c7a8c20 100644
--- a/arch/arm/kernel/entry-common.S
+++ b/arch/arm/kernel/entry-common.S
@@ -146,6 +146,7 @@ mcount_call:
bl ftrace_stub
ldr lr, [fp, #-4] @ restore lr
ldmia sp!, {r0-r3, pc}
+ENDPROC(mcount)
ENTRY(ftrace_caller)
stmdb sp!, {r0-r3, lr}
@@ -158,6 +159,7 @@ ftrace_call:
bl ftrace_stub
ldr lr, [fp, #-4] @ restore lr
ldmia sp!, {r0-r3, pc}
+ENDPROC(ftrace_caller)
#else
@@ -179,6 +181,7 @@ gnu_trace:
mov pc, r2
ldmia sp!, {r0-r3, ip, lr}
mov pc, ip
+ENDPROC(__gnu_mcount_nc)
#ifdef CONFIG_OLD_MCOUNT
/*
@@ -204,13 +207,14 @@ trace:
mov pc, r2
ldr lr, [fp, #-4] @ restore lr
ldmia sp!, {r0-r3, pc}
+ENDPROC(mcount)
#endif
#endif /* CONFIG_DYNAMIC_FTRACE */
- .globl ftrace_stub
-ftrace_stub:
+ENTRY(ftrace_stub)
mov pc, lr
+ENDPROC(ftrace_stub)
#endif /* CONFIG_FUNCTION_TRACER */
--
1.7.0.4
next prev parent reply other threads:[~2010-04-21 19:23 UTC|newest]
Thread overview: 78+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-13 6:49 [PATCH 00/10] ARM: ftrace: cleanups, Thumb-2, and dynamic ftrace (v2) Rabin Vincent
2010-03-13 6:49 ` Rabin Vincent
2010-03-13 6:49 ` [PATCH 01/10] ARM: ftrace: clean up mcount assembly indentation Rabin Vincent
2010-03-13 6:49 ` Rabin Vincent
2010-03-13 6:49 ` [PATCH 02/10] ARM: ftrace: document mcount formats Rabin Vincent
2010-03-13 6:49 ` Rabin Vincent
2010-03-13 6:49 ` [PATCH 03/10] ftrace: allow building without frame pointers Rabin Vincent
2010-03-13 6:49 ` Rabin Vincent
2010-03-13 17:36 ` Steven Rostedt
2010-03-13 17:36 ` Steven Rostedt
2010-03-15 18:45 ` Rabin Vincent
2010-03-15 18:45 ` Rabin Vincent
2010-03-14 16:56 ` Steven Rostedt
2010-03-14 16:56 ` Steven Rostedt
2010-03-13 6:49 ` [PATCH 04/10] ARM: " Rabin Vincent
2010-03-13 6:49 ` Rabin Vincent
2010-03-13 17:38 ` Steven Rostedt
2010-03-13 17:38 ` Steven Rostedt
2010-03-14 16:56 ` Steven Rostedt
2010-03-14 16:56 ` Steven Rostedt
2010-03-17 16:16 ` Catalin Marinas
2010-03-17 16:16 ` Catalin Marinas
2010-03-13 6:49 ` [PATCH 05/10] ARM: ftrace: add ENDPROC annotations Rabin Vincent
2010-03-13 6:49 ` Rabin Vincent
2010-03-13 8:45 ` Russell King - ARM Linux
2010-03-13 8:45 ` Russell King - ARM Linux
2010-04-21 19:23 ` Rabin Vincent [this message]
2010-04-21 19:23 ` Rabin Vincent
2010-08-10 17:07 ` Catalin Marinas
2010-08-10 17:07 ` Catalin Marinas
2010-08-10 19:11 ` Rabin Vincent
2010-08-10 19:11 ` Rabin Vincent
2010-03-13 6:49 ` [PATCH 06/10] ARM: ftrace: add Thumb-2 support Rabin Vincent
2010-03-13 6:49 ` Rabin Vincent
2010-03-14 22:30 ` Catalin Marinas
2010-03-14 22:30 ` Catalin Marinas
2010-03-15 18:32 ` Rabin Vincent
2010-03-15 18:32 ` Rabin Vincent
2010-03-16 10:23 ` Catalin Marinas
2010-03-16 10:23 ` Catalin Marinas
2010-03-31 18:25 ` Rabin Vincent
2010-03-31 18:25 ` Rabin Vincent
2010-04-23 15:37 ` Catalin Marinas
2010-04-23 15:37 ` Catalin Marinas
2010-03-13 6:49 ` [PATCH 07/10] ftrace: pass KBUILD_CFLAGS to record_mcount.pl Rabin Vincent
2010-03-13 6:49 ` Rabin Vincent
2010-03-13 17:41 ` Steven Rostedt
2010-03-13 17:41 ` Steven Rostedt
2010-03-14 16:56 ` Steven Rostedt
2010-03-14 16:56 ` Steven Rostedt
2010-03-31 18:45 ` Rabin Vincent
2010-03-31 18:45 ` Rabin Vincent
2010-08-03 16:42 ` Rabin Vincent
2010-08-03 16:42 ` Rabin Vincent
2010-08-06 15:31 ` Frederic Weisbecker
2010-08-06 15:31 ` Frederic Weisbecker
2010-08-06 20:23 ` Steven Rostedt
2010-08-06 20:23 ` Steven Rostedt
2010-08-07 5:33 ` Rabin Vincent
2010-08-07 5:33 ` Rabin Vincent
2010-08-07 12:57 ` Steven Rostedt
2010-08-07 12:57 ` Steven Rostedt
2010-03-13 6:49 ` [PATCH 08/10] ARM: ftrace: fix and update dynamic ftrace Rabin Vincent
2010-03-13 6:49 ` Rabin Vincent
2010-03-13 17:42 ` Steven Rostedt
2010-03-13 17:42 ` Steven Rostedt
2010-03-14 16:56 ` Steven Rostedt
2010-03-14 16:56 ` Steven Rostedt
2010-03-13 6:49 ` [PATCH 09/10] ARM: ftrace: add Thumb-2 support to " Rabin Vincent
2010-03-13 6:49 ` Rabin Vincent
2010-03-13 6:49 ` [PATCH 10/10] ARM: ftrace: enable " Rabin Vincent
2010-03-13 6:49 ` Rabin Vincent
2010-04-21 19:26 ` [PATCH 00/10] ARM: ftrace: cleanups, Thumb-2, and dynamic ftrace (v2) Rabin Vincent
2010-04-21 19:26 ` Rabin Vincent
-- strict thread matches above, loose matches on Subject: below --
2010-02-13 19:48 [PATCH 00/10] ARM: ftrace: cleanups, Thumb-2, and dynamic ftrace Rabin Vincent
2010-02-13 19:48 ` [PATCH 05/10] ARM: ftrace: add ENDPROC annotations Rabin Vincent
2010-02-13 19:48 ` Rabin Vincent
2010-02-13 22:54 ` Catalin Marinas
2010-02-13 22:54 ` Catalin Marinas
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=20100421192319.GA16719@debian \
--to=rabin@rab.in \
--cc=linux-arm-kernel@lists.infradead.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.