Re: [ 099/180] powerpc/ftrace: Fix assembly trampoline register usage

[Paul Gortmaker]

On 12-10-01 06:53 PM, Willy Tarreau wrote:
> 2.6.32-longterm review patch.  If anyone has any objections, please let me know.
> 
> ------------------
> 
> From: roger blofeld <blofeldus@xxxxxxxxx>
> 
> commit fd5a42980e1cf327b7240adf5e7b51ea41c23437 upstream.
> 
> Just like the module loader, ftrace needs to be updated to use r12
> instead of r11 with newer gcc's.
> 
> Signed-off-by: Roger Blofeld <blofeldus@xxxxxxxxx>
> Signed-off-by: Benjamin Herrenschmidt <benh@xxxxxxxxxxxxxxxxxxx>
> Signed-off-by: Paul Gortmaker <paul.gortmaker@xxxxxxxxxxxxx>
> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
> 
> commit a8ed5765b5a8bf44a86284d80afd24f37a23e369 upstream.

Not sure what the above is -- cut and paste misstep?
The fd5a429 at the top is the correct parent though.

P.
--

> Signed-off-by: Willy Tarreau <w@xxxxxx>
> ---
>  arch/powerpc/kernel/ftrace.c |   12 ++++++------
>  1 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git a/arch/powerpc/kernel/ftrace.c b/arch/powerpc/kernel/ftrace.c
> index ce1f3e4..eda40d2 100644
> --- a/arch/powerpc/kernel/ftrace.c
> +++ b/arch/powerpc/kernel/ftrace.c
> @@ -244,9 +244,9 @@ __ftrace_make_nop(struct module *mod,
>  
>  	/*
>  	 * On PPC32 the trampoline looks like:
> -	 *  0x3d, 0x60, 0x00, 0x00  lis r11,sym@ha
> -	 *  0x39, 0x6b, 0x00, 0x00  addi r11,r11,sym@l
> -	 *  0x7d, 0x69, 0x03, 0xa6  mtctr r11
> +	 *  0x3d, 0x80, 0x00, 0x00  lis r12,sym@ha
> +	 *  0x39, 0x8c, 0x00, 0x00  addi r12,r12,sym@l
> +	 *  0x7d, 0x89, 0x03, 0xa6  mtctr r12
>  	 *  0x4e, 0x80, 0x04, 0x20  bctr
>  	 */
>  
> @@ -261,9 +261,9 @@ __ftrace_make_nop(struct module *mod,
>  	pr_devel(" %08x %08x ", jmp[0], jmp[1]);
>  
>  	/* verify that this is what we expect it to be */
> -	if (((jmp[0] & 0xffff0000) != 0x3d600000) ||
> -	    ((jmp[1] & 0xffff0000) != 0x396b0000) ||
> -	    (jmp[2] != 0x7d6903a6) ||
> +	if (((jmp[0] & 0xffff0000) != 0x3d800000) ||
> +	    ((jmp[1] & 0xffff0000) != 0x398c0000) ||
> +	    (jmp[2] != 0x7d8903a6) ||
>  	    (jmp[3] != 0x4e800420)) {
>  		printk(KERN_ERR "Not a trampoline\n");
>  		return -EINVAL;
> 
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/