[Linaro][Pull Request] Adding Dynamic Ftrace capabilities in ARM

[Lee Jones]

On 07/10/10 16:16, Mathieu Poirier wrote:
> This set of patches add dynamic ftrace capabilities to ARM.
> 
> This work has been submitted here:
> http://git.kernel.org/?p=linux/kernel/git/sfr/linux-next.git;a=shortlog;h=80be7a7f642719bf99fc49692fc77d6333f51a73
> 
> The following changes since commit d0bbdab2bb2c55c3dc6a4b3fd2128250dff99feb:
>   John Rigby (1):
>         LINARO: Linaro-2.6.35-1006.12
> 
> are available in the git repository at:
> 
>   git://kernel.ubuntu.com/mpoirier/linux-linaro.git dynamic-ftrace
> 
> Rabin Vincent (8):
>       ARM: 6312/1: ftrace: allow building without frame pointers
>       ARM: 6314/1: ftrace: allow build without frame pointers on ARM
>       ARM: 6315/1: ftrace: add ENDPROC annotations
>       ARM: 6316/1: ftrace: add Thumb-2 support
>       ARM: 6317/1: ftrace: pass KBUILD_CFLAGS to record_mcount.pl
>       ARM: 6318/1: ftrace: fix and update dynamic ftrace
>       ARM: 6319/1: ftrace: add Thumb-2 support to dynamic ftrace
>       ARM: 6320/1: ftrace: enable dynamic ftrace
> 
>  Makefile                       |    7 ++
>  arch/arm/Kconfig               |    2 +
>  arch/arm/Kconfig.debug         |    5 +
>  arch/arm/include/asm/ftrace.h  |   20 ++++-
>  arch/arm/kernel/armksyms.c     |    2 +
>  arch/arm/kernel/entry-common.S |   63 +++++++++++---
>  arch/arm/kernel/ftrace.c       |  188 +++++++++++++++++++++++++++++----------
>  kernel/trace/Kconfig           |    2 +-
>  scripts/Makefile.build         |    3 +-
>  scripts/recordmcount.pl        |    2 +
>  10 files changed, 231 insertions(+), 63 deletions(-)

I'm assuming this can't wait until 2.6.37?

Also, how did you pull these over to your own branch?

If memory serves me correctly you should use "cherry-pick -x"

In apw's words, this "retains the upstream identifier" of each of the commits.