From: Frederic Weisbecker <fweisbec@gmail.com> To: Rabin Vincent <rabin@rab.in> Cc: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, "Steven Rostedt" <rostedt@goodmis.org>, "Ingo Molnar" <mingo@redhat.com>, "Abhishek Sagar" <sagar.abhishek@gmail.com>, "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de> Subject: Re: [PATCH 01/10] ARM: ftrace: clean up mcount assembly indentation Date: Mon, 22 Feb 2010 19:36:48 +0100 [thread overview] Message-ID: <20100222183646.GH5055@nowhere> (raw) In-Reply-To: <1266090518-31120-2-git-send-email-rabin@rab.in> On Sun, Feb 14, 2010 at 01:18:29AM +0530, Rabin Vincent wrote: > The mcount implementation currently uses a different indentation style > from the rest of the file (and the rest of the ARM assembly in the > kernel). Clean it up. > > Signed-off-by: Rabin Vincent <rabin@rab.in> > --- Acked-by: Frederic Weisbecker <fweisbec@gmail.com> > arch/arm/kernel/entry-common.S | 88 ++++++++++++++++++++-------------------- > 1 files changed, 44 insertions(+), 44 deletions(-) > > diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S > index 2c1db77..0b042bd 100644 > --- a/arch/arm/kernel/entry-common.S > +++ b/arch/arm/kernel/entry-common.S > @@ -94,73 +94,73 @@ ENDPROC(ret_from_fork) > #ifdef CONFIG_FUNCTION_TRACER > #ifdef CONFIG_DYNAMIC_FTRACE > ENTRY(mcount) > - stmdb sp!, {r0-r3, lr} > - mov r0, lr > - sub r0, r0, #MCOUNT_INSN_SIZE > + stmdb sp!, {r0-r3, lr} > + mov r0, lr > + sub r0, r0, #MCOUNT_INSN_SIZE > > .globl mcount_call > mcount_call: > - bl ftrace_stub > - ldr lr, [fp, #-4] @ restore lr > - ldmia sp!, {r0-r3, pc} > + bl ftrace_stub > + ldr lr, [fp, #-4] @ restore lr > + ldmia sp!, {r0-r3, pc} > > ENTRY(ftrace_caller) > - stmdb sp!, {r0-r3, lr} > - ldr r1, [fp, #-4] > - mov r0, lr > - sub r0, r0, #MCOUNT_INSN_SIZE > + stmdb sp!, {r0-r3, lr} > + ldr r1, [fp, #-4] > + mov r0, lr > + sub r0, r0, #MCOUNT_INSN_SIZE > > .globl ftrace_call > ftrace_call: > - bl ftrace_stub > - ldr lr, [fp, #-4] @ restore lr > - ldmia sp!, {r0-r3, pc} > + bl ftrace_stub > + ldr lr, [fp, #-4] @ restore lr > + ldmia sp!, {r0-r3, pc} > > #else > > ENTRY(__gnu_mcount_nc) > - stmdb sp!, {r0-r3, lr} > - ldr r0, =ftrace_trace_function > - ldr r2, [r0] > - adr r0, ftrace_stub > - cmp r0, r2 > - bne gnu_trace > - ldmia sp!, {r0-r3, ip, lr} > - mov pc, ip > + stmdb sp!, {r0-r3, lr} > + ldr r0, =ftrace_trace_function > + ldr r2, [r0] > + adr r0, ftrace_stub > + cmp r0, r2 > + bne gnu_trace > + ldmia sp!, {r0-r3, ip, lr} > + mov pc, ip > > gnu_trace: > - ldr r1, [sp, #20] @ lr of instrumented routine > - mov r0, lr > - sub r0, r0, #MCOUNT_INSN_SIZE > - mov lr, pc > - mov pc, r2 > - ldmia sp!, {r0-r3, ip, lr} > - mov pc, ip > + ldr r1, [sp, #20] @ lr of instrumented routine > + mov r0, lr > + sub r0, r0, #MCOUNT_INSN_SIZE > + mov lr, pc > + mov pc, r2 > + ldmia sp!, {r0-r3, ip, lr} > + mov pc, ip > > ENTRY(mcount) > - stmdb sp!, {r0-r3, lr} > - ldr r0, =ftrace_trace_function > - ldr r2, [r0] > - adr r0, ftrace_stub > - cmp r0, r2 > - bne trace > - ldr lr, [fp, #-4] @ restore lr > - ldmia sp!, {r0-r3, pc} > + stmdb sp!, {r0-r3, lr} > + ldr r0, =ftrace_trace_function > + ldr r2, [r0] > + adr r0, ftrace_stub > + cmp r0, r2 > + bne trace > + ldr lr, [fp, #-4] @ restore lr > + ldmia sp!, {r0-r3, pc} > > trace: > - ldr r1, [fp, #-4] @ lr of instrumented routine > - mov r0, lr > - sub r0, r0, #MCOUNT_INSN_SIZE > - mov lr, pc > - mov pc, r2 > - ldr lr, [fp, #-4] @ restore lr > - ldmia sp!, {r0-r3, pc} > + ldr r1, [fp, #-4] @ lr of instrumented routine > + mov r0, lr > + sub r0, r0, #MCOUNT_INSN_SIZE > + mov lr, pc > + mov pc, r2 > + ldr lr, [fp, #-4] @ restore lr > + ldmia sp!, {r0-r3, pc} > > #endif /* CONFIG_DYNAMIC_FTRACE */ > > .globl ftrace_stub > ftrace_stub: > - mov pc, lr > + mov pc, lr > > #endif /* CONFIG_FUNCTION_TRACER */ > > -- > 1.6.6 >
WARNING: multiple messages have this Message-ID (diff)
From: fweisbec@gmail.com (Frederic Weisbecker) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 01/10] ARM: ftrace: clean up mcount assembly indentation Date: Mon, 22 Feb 2010 19:36:48 +0100 [thread overview] Message-ID: <20100222183646.GH5055@nowhere> (raw) In-Reply-To: <1266090518-31120-2-git-send-email-rabin@rab.in> On Sun, Feb 14, 2010 at 01:18:29AM +0530, Rabin Vincent wrote: > The mcount implementation currently uses a different indentation style > from the rest of the file (and the rest of the ARM assembly in the > kernel). Clean it up. > > Signed-off-by: Rabin Vincent <rabin@rab.in> > --- Acked-by: Frederic Weisbecker <fweisbec@gmail.com> > arch/arm/kernel/entry-common.S | 88 ++++++++++++++++++++-------------------- > 1 files changed, 44 insertions(+), 44 deletions(-) > > diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S > index 2c1db77..0b042bd 100644 > --- a/arch/arm/kernel/entry-common.S > +++ b/arch/arm/kernel/entry-common.S > @@ -94,73 +94,73 @@ ENDPROC(ret_from_fork) > #ifdef CONFIG_FUNCTION_TRACER > #ifdef CONFIG_DYNAMIC_FTRACE > ENTRY(mcount) > - stmdb sp!, {r0-r3, lr} > - mov r0, lr > - sub r0, r0, #MCOUNT_INSN_SIZE > + stmdb sp!, {r0-r3, lr} > + mov r0, lr > + sub r0, r0, #MCOUNT_INSN_SIZE > > .globl mcount_call > mcount_call: > - bl ftrace_stub > - ldr lr, [fp, #-4] @ restore lr > - ldmia sp!, {r0-r3, pc} > + bl ftrace_stub > + ldr lr, [fp, #-4] @ restore lr > + ldmia sp!, {r0-r3, pc} > > ENTRY(ftrace_caller) > - stmdb sp!, {r0-r3, lr} > - ldr r1, [fp, #-4] > - mov r0, lr > - sub r0, r0, #MCOUNT_INSN_SIZE > + stmdb sp!, {r0-r3, lr} > + ldr r1, [fp, #-4] > + mov r0, lr > + sub r0, r0, #MCOUNT_INSN_SIZE > > .globl ftrace_call > ftrace_call: > - bl ftrace_stub > - ldr lr, [fp, #-4] @ restore lr > - ldmia sp!, {r0-r3, pc} > + bl ftrace_stub > + ldr lr, [fp, #-4] @ restore lr > + ldmia sp!, {r0-r3, pc} > > #else > > ENTRY(__gnu_mcount_nc) > - stmdb sp!, {r0-r3, lr} > - ldr r0, =ftrace_trace_function > - ldr r2, [r0] > - adr r0, ftrace_stub > - cmp r0, r2 > - bne gnu_trace > - ldmia sp!, {r0-r3, ip, lr} > - mov pc, ip > + stmdb sp!, {r0-r3, lr} > + ldr r0, =ftrace_trace_function > + ldr r2, [r0] > + adr r0, ftrace_stub > + cmp r0, r2 > + bne gnu_trace > + ldmia sp!, {r0-r3, ip, lr} > + mov pc, ip > > gnu_trace: > - ldr r1, [sp, #20] @ lr of instrumented routine > - mov r0, lr > - sub r0, r0, #MCOUNT_INSN_SIZE > - mov lr, pc > - mov pc, r2 > - ldmia sp!, {r0-r3, ip, lr} > - mov pc, ip > + ldr r1, [sp, #20] @ lr of instrumented routine > + mov r0, lr > + sub r0, r0, #MCOUNT_INSN_SIZE > + mov lr, pc > + mov pc, r2 > + ldmia sp!, {r0-r3, ip, lr} > + mov pc, ip > > ENTRY(mcount) > - stmdb sp!, {r0-r3, lr} > - ldr r0, =ftrace_trace_function > - ldr r2, [r0] > - adr r0, ftrace_stub > - cmp r0, r2 > - bne trace > - ldr lr, [fp, #-4] @ restore lr > - ldmia sp!, {r0-r3, pc} > + stmdb sp!, {r0-r3, lr} > + ldr r0, =ftrace_trace_function > + ldr r2, [r0] > + adr r0, ftrace_stub > + cmp r0, r2 > + bne trace > + ldr lr, [fp, #-4] @ restore lr > + ldmia sp!, {r0-r3, pc} > > trace: > - ldr r1, [fp, #-4] @ lr of instrumented routine > - mov r0, lr > - sub r0, r0, #MCOUNT_INSN_SIZE > - mov lr, pc > - mov pc, r2 > - ldr lr, [fp, #-4] @ restore lr > - ldmia sp!, {r0-r3, pc} > + ldr r1, [fp, #-4] @ lr of instrumented routine > + mov r0, lr > + sub r0, r0, #MCOUNT_INSN_SIZE > + mov lr, pc > + mov pc, r2 > + ldr lr, [fp, #-4] @ restore lr > + ldmia sp!, {r0-r3, pc} > > #endif /* CONFIG_DYNAMIC_FTRACE */ > > .globl ftrace_stub > ftrace_stub: > - mov pc, lr > + mov pc, lr > > #endif /* CONFIG_FUNCTION_TRACER */ > > -- > 1.6.6 >
next prev parent reply other threads:[~2010-02-22 18:36 UTC|newest] Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top 2010-02-13 19:48 [PATCH 00/10] ARM: ftrace: cleanups, Thumb-2, and dynamic ftrace Rabin Vincent 2010-02-13 19:48 ` Rabin Vincent 2010-02-13 19:48 ` [PATCH 01/10] ARM: ftrace: clean up mcount assembly indentation Rabin Vincent 2010-02-13 19:48 ` Rabin Vincent 2010-02-13 20:18 ` Uwe Kleine-König 2010-02-13 20:18 ` Uwe Kleine-König 2010-02-22 18:36 ` Frederic Weisbecker [this message] 2010-02-22 18:36 ` Frederic Weisbecker 2010-02-13 19:48 ` [PATCH 02/10] ARM: ftrace: document mcount formats Rabin Vincent 2010-02-13 19:48 ` Rabin Vincent 2010-02-13 20:37 ` Uwe Kleine-König 2010-02-13 20:37 ` Uwe Kleine-König 2010-02-22 18:06 ` Rabin Vincent 2010-02-22 18:06 ` Rabin Vincent 2010-02-22 19:20 ` Uwe Kleine-König 2010-02-22 19:20 ` Uwe Kleine-König 2010-02-23 19:42 ` Rabin Vincent 2010-02-23 19:42 ` Rabin Vincent 2010-02-23 20:27 ` Uwe Kleine-König 2010-02-23 20:27 ` Uwe Kleine-König 2010-02-22 18:41 ` Frederic Weisbecker 2010-02-22 18:41 ` Frederic Weisbecker 2010-02-13 19:48 ` [PATCH 03/10] ftrace: allow building without frame pointers Rabin Vincent 2010-02-13 19:48 ` Rabin Vincent 2010-02-22 18:36 ` Frederic Weisbecker 2010-02-22 18:36 ` Frederic Weisbecker 2010-02-23 13:44 ` Steven Rostedt 2010-02-23 13:44 ` Steven Rostedt 2010-02-13 19:48 ` [PATCH 04/10] ARM: " Rabin Vincent 2010-02-13 19:48 ` Rabin Vincent 2010-02-22 19:05 ` Frederic Weisbecker 2010-02-22 19:05 ` Frederic Weisbecker 2010-02-23 13:18 ` Steven Rostedt 2010-02-23 13:18 ` Steven Rostedt 2010-02-23 17:11 ` Frederic Weisbecker 2010-02-23 17:11 ` Frederic Weisbecker 2010-02-23 17:58 ` Rabin Vincent 2010-02-23 17:58 ` Rabin Vincent 2010-02-23 18:03 ` Steven Rostedt 2010-02-23 18:03 ` Steven Rostedt 2010-02-23 18:41 ` Rabin Vincent 2010-02-23 18:41 ` Rabin Vincent 2010-02-23 13:47 ` Steven Rostedt 2010-02-23 13:47 ` Steven Rostedt 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 2010-02-13 19:48 ` [PATCH 06/10] ARM: ftrace: add Thumb-2 support Rabin Vincent 2010-02-13 19:48 ` Rabin Vincent 2010-02-13 23:27 ` Catalin Marinas 2010-02-13 23:27 ` Catalin Marinas 2010-02-14 16:38 ` Rabin Vincent 2010-02-14 16:38 ` Rabin Vincent 2010-02-13 19:48 ` [PATCH 07/10] ftrace: pass KBUILD_CFLAGS to record_mcount.pl Rabin Vincent 2010-02-13 19:48 ` Rabin Vincent 2010-02-23 13:30 ` Steven Rostedt 2010-02-23 13:30 ` Steven Rostedt 2010-02-23 18:23 ` Rabin Vincent 2010-02-23 18:23 ` Rabin Vincent 2010-02-23 18:37 ` Steven Rostedt 2010-02-23 18:37 ` Steven Rostedt 2010-02-13 19:48 ` [PATCH 08/10] ARM: ftrace: fix and update dynamic ftrace Rabin Vincent 2010-02-13 19:48 ` Rabin Vincent 2010-02-14 11:08 ` Uwe Kleine-König 2010-02-14 11:08 ` Uwe Kleine-König 2010-02-14 15:53 ` Rabin Vincent 2010-02-14 15:53 ` Rabin Vincent 2010-02-13 19:48 ` [PATCH 09/10] ARM: ftrace: add Thumb-2 support to " Rabin Vincent 2010-02-13 19:48 ` Rabin Vincent 2010-02-23 13:35 ` Steven Rostedt 2010-02-23 13:35 ` Steven Rostedt 2010-02-23 17:10 ` Rabin Vincent 2010-02-23 17:10 ` Rabin Vincent 2010-02-13 19:48 ` [PATCH 10/10] ARM: ftrace: enable " Rabin Vincent 2010-02-13 19:48 ` Rabin Vincent 2010-02-22 18:16 ` [PATCH 00/10] ARM: ftrace: cleanups, Thumb-2, and " Rabin Vincent 2010-02-22 18:16 ` Rabin Vincent 2010-03-13 6:49 [PATCH 00/10] ARM: ftrace: cleanups, Thumb-2, and dynamic ftrace (v2) 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
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=20100222183646.GH5055@nowhere \ --to=fweisbec@gmail.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=mingo@redhat.com \ --cc=rabin@rab.in \ --cc=rostedt@goodmis.org \ --cc=sagar.abhishek@gmail.com \ --cc=u.kleine-koenig@pengutronix.de \ /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: linkBe 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.