2022-12-15 12:18:09

by Sathvika Vasireddy

[permalink] [raw]
Subject: [PATCH] powerpc/32: Curb objtool unannotated intra-function call warning

objtool throws the following warning:
arch/powerpc/kexec/relocate_32.o: warning: objtool: .text+0x2bc: unannotated intra-function call

Fix this warning by annotating intra-function call, using
ANNOTATE_INTRA_FUNCTION_CALL macro, to indicate that the branch target
is valid.

Reported-by: kernel test robot <[email protected]>
Signed-off-by: Sathvika Vasireddy <[email protected]>
---
arch/powerpc/kexec/relocate_32.S | 2 ++
1 file changed, 2 insertions(+)

diff --git a/arch/powerpc/kexec/relocate_32.S b/arch/powerpc/kexec/relocate_32.S
index d9f0dd9b34ff..104c9911f406 100644
--- a/arch/powerpc/kexec/relocate_32.S
+++ b/arch/powerpc/kexec/relocate_32.S
@@ -8,6 +8,7 @@
* Author: Suzuki Poulose <[email protected]>
*/

+#include <linux/objtool.h>
#include <asm/reg.h>
#include <asm/page.h>
#include <asm/mmu.h>
@@ -349,6 +350,7 @@ write_utlb:
cmpwi r10, PPC47x_TLB0_4K
bne 0f
li r10, 0x1000 /* r10 = 4k */
+ ANNOTATE_INTRA_FUNCTION_CALL
bl 1f

0:
--
2.31.1


2024-03-13 13:30:35

by Michael Ellerman

[permalink] [raw]
Subject: Re: [PATCH] powerpc/32: Curb objtool unannotated intra-function call warning

On Thu, 15 Dec 2022 17:22:58 +0530, Sathvika Vasireddy wrote:
> objtool throws the following warning:
> arch/powerpc/kexec/relocate_32.o: warning: objtool: .text+0x2bc: unannotated intra-function call
>
> Fix this warning by annotating intra-function call, using
> ANNOTATE_INTRA_FUNCTION_CALL macro, to indicate that the branch target
> is valid.
>
> [...]

Applied to powerpc/next.

[1/1] powerpc/32: Curb objtool unannotated intra-function call warning
https://git.kernel.org/powerpc/c/6035e7e35482653d6d93f35f01e1a320573d58f0

cheers