On Sat, 13 Jun 2009, David Miller wrote:
>
> Do the ftrace maintainers mind if I merge the following in via my
> sparc-next-2.6 tree?
Not at all.
>
> Thanks!
>
> sparc64: Add proper dynamic ftrace support.
>
> Signed-off-by: David S. Miller <davem@xxxxxxxxxxxxx>
> ---
> arch/sparc/Kconfig | 2 +
> arch/sparc/include/asm/ftrace.h | 11 +++++++++
> arch/sparc/kernel/ftrace.c | 47 ++++++++++++++++++++++++++------------
> scripts/recordmcount.pl | 20 ++++++++++++++++
> 4 files changed, 65 insertions(+), 15 deletions(-)
>
> +#endif
> +
> diff --git a/scripts/recordmcount.pl b/scripts/recordmcount.pl
> index 409596e..e694eaf 100755
> --- a/scripts/recordmcount.pl
> +++ b/scripts/recordmcount.pl
> @@ -213,6 +213,26 @@ if ($arch eq "x86_64") {
> if ($is_module eq "0") {
> $cc .= " -mconstant-gp";
> }
> +} elsif ($arch eq "sparc64") {
> + # In the objdump output there are giblets like:
> + # 0000000000000000 <igmp_net_exit-0x18>:
> + # As there's some data blobs that get emitted into the
> + # text section before the first instructions and the first
> + # real symbols. We don't want to match that, so to combat
> + # this we use '\w' so we'll match just plain symbol names,
> + # and not those that also include hex offsets inside of the
> + # '<>' brackets. Actually the generic function_regex setting
> + # could safely use this too.
> + $function_regex = "^([0-9a-fA-F]+)\\s+<(\\w*?)>:";
> +
> + # Sparc64 calls '_mcount' instead of plain 'mcount'.
> + $mcount_regex = "^\\s*([0-9a-fA-F]+):.*\\s_mcount\$";
> +
> + $alignment = 8;
> + $type = ".xword";
> + $ld .= " -m elf64_sparc";
> + $cc .= " -m64";
> + $objcopy .= " -O elf64-sparc";
> } else {
> die "Arch $arch is not supported with CONFIG_FTRACE_MCOUNT_RECORD";
> }
The only thing outside of arch/sparc is this recordmcount.pl, and that too
is arch specific.
I'm fine with it.
Acked-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
-- Steve
--
To unsubscribe from this list: send the line "unsubscribe sparclinux" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
