From: Vladimir Riabchun Date: Tue, 26 Aug 2025 16:16:46 +0000 (+0200) Subject: ftrace/samples: Fix function size computation X-Git-Tag: v6.12.48~112 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fd84053dafeb0b325d0eb7130e5480c76b893e57;p=thirdparty%2Fkernel%2Fstable.git ftrace/samples: Fix function size computation [ Upstream commit 80d03a40837a9b26750a25122b906c052cc846c9 ] In my_tramp1 function .size directive was placed above ASM_RET instruction, leading to a wrong function size. Link: https://lore.kernel.org/aK3d7vxNcO52kEmg@vova-pc Fixes: 9d907f1ae80b ("samples/ftrace: Fix asm function ELF annotations") Signed-off-by: Vladimir Riabchun Signed-off-by: Steven Rostedt (Google) Signed-off-by: Sasha Levin --- diff --git a/samples/ftrace/ftrace-direct-modify.c b/samples/ftrace/ftrace-direct-modify.c index 81220390851a3..328c6e60f024b 100644 --- a/samples/ftrace/ftrace-direct-modify.c +++ b/samples/ftrace/ftrace-direct-modify.c @@ -75,8 +75,8 @@ asm ( CALL_DEPTH_ACCOUNT " call my_direct_func1\n" " leave\n" -" .size my_tramp1, .-my_tramp1\n" ASM_RET +" .size my_tramp1, .-my_tramp1\n" " .type my_tramp2, @function\n" " .globl my_tramp2\n"