diff for duplicates of <20100421192319.GA16719@debian> diff --git a/a/1.txt b/N1/1.txt index de2670d..7668614 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -8,3 +8,67 @@ On Sat, Mar 13, 2010 at 08:45:46AM +0000, Russell King - ARM Linux wrote: > 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 diff --git a/a/content_digest b/N1/content_digest index 72ac5ed..2584ff2 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +1,17 @@ "ref\01268462987-8271-1-git-send-email-rabin@rab.in\0" "ref\01268462987-8271-6-git-send-email-rabin@rab.in\0" "ref\020100313084546.GA30400@n2100.arm.linux.org.uk\0" - "From\0rabin@rab.in (Rabin Vincent)\0" - "Subject\0[PATCH 05/10] ARM: ftrace: add ENDPROC annotations\0" + "From\0Rabin Vincent <rabin@rab.in>\0" + "Subject\0Re: [PATCH 05/10] ARM: ftrace: add ENDPROC annotations\0" "Date\0Thu, 22 Apr 2010 00:53:19 +0530\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Russell King - ARM Linux <linux@arm.linux.org.uk>\0" + "Cc\0linux-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\303\266nig <u.kleine-koenig@pengutronix.de>" + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Sat, Mar 13, 2010 at 08:45:46AM +0000, Russell King - ARM Linux wrote:\n" @@ -16,6 +23,70 @@ "> \n" "> ENTRY does the .globl for you, so please kill your own version.\n" "\n" - Updated patch below. + "Updated patch below.\n" + "\n" + ">From 87b70ed633da00fe9873a5819c6d24e57368de43 Mon Sep 17 00:00:00 2001\n" + "From: Rabin Vincent <rabin@rab.in>\n" + "Date: Sun, 14 Feb 2010 01:18:33 +0530\n" + "Subject: [PATCH] ARM: ftrace: add ENDPROC annotations\n" + "\n" + "When building as Thumb-2, the \".type foo, %function\" annotation in\n" + "ENDPROC seems to be required in order for the assembly routines to be\n" + "recognized as Thumb-2 code. If the ENDPROC annotations are not present,\n" + "calls to these routines are generated as BLX instead of BL.\n" + "\n" + "Acked-by: Catalin Marinas <catalin.marinas@arm.com>\n" + "Signed-off-by: Rabin Vincent <rabin@rab.in>\n" + "---\n" + " arch/arm/kernel/entry-common.S | 8 ++++++--\n" + " 1 files changed, 6 insertions(+), 2 deletions(-)\n" + "\n" + "diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S\n" + "index 6805a72..c7a8c20 100644\n" + "--- a/arch/arm/kernel/entry-common.S\n" + "+++ b/arch/arm/kernel/entry-common.S\n" + "@@ -146,6 +146,7 @@ mcount_call:\n" + " \tbl\tftrace_stub\n" + " \tldr\tlr, [fp, #-4]\t\t\t@ restore lr\n" + " \tldmia\tsp!, {r0-r3, pc}\n" + "+ENDPROC(mcount)\n" + " \n" + " ENTRY(ftrace_caller)\n" + " \tstmdb\tsp!, {r0-r3, lr}\n" + "@@ -158,6 +159,7 @@ ftrace_call:\n" + " \tbl\tftrace_stub\n" + " \tldr\tlr, [fp, #-4]\t\t\t@ restore lr\n" + " \tldmia\tsp!, {r0-r3, pc}\n" + "+ENDPROC(ftrace_caller)\n" + " \n" + " #else\n" + " \n" + "@@ -179,6 +181,7 @@ gnu_trace:\n" + " \tmov\tpc, r2\n" + " \tldmia\tsp!, {r0-r3, ip, lr}\n" + " \tmov\tpc, ip\n" + "+ENDPROC(__gnu_mcount_nc)\n" + " \n" + " #ifdef CONFIG_OLD_MCOUNT\n" + " /*\n" + "@@ -204,13 +207,14 @@ trace:\n" + " \tmov\tpc, r2\n" + " \tldr\tlr, [fp, #-4]\t\t\t@ restore lr\n" + " \tldmia\tsp!, {r0-r3, pc}\n" + "+ENDPROC(mcount)\n" + " #endif\n" + " \n" + " #endif /* CONFIG_DYNAMIC_FTRACE */\n" + " \n" + "-\t.globl ftrace_stub\n" + "-ftrace_stub:\n" + "+ENTRY(ftrace_stub)\n" + " \tmov\tpc, lr\n" + "+ENDPROC(ftrace_stub)\n" + " \n" + " #endif /* CONFIG_FUNCTION_TRACER */\n" + " \n" + "-- \n" + 1.7.0.4 -73a4eb7da44ef51e6afb9610f0160ccf498e3d08775e689b826ec12aea20ed92 +56fed65e467a4655ecb57d2213f70d568f3894dde27cbc5e000ff69acbf1658f
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.