From: Naveen N Rao <naveen@kernel.org>
Date: Wed, 30 Oct 2024 07:08:41 +0000 (+0530)
Subject: powerpc/ftrace: Move ftrace stub used for init text before _einittext
X-Git-Tag: v6.13-rc1~98^2~50
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ed6144656bb1ea29ad83671b48a21c89e7873b8a;p=thirdparty%2Fkernel%2Flinux.git

powerpc/ftrace: Move ftrace stub used for init text before _einittext

Move the ftrace stub used to cover inittext before _einittext so that it
is within kernel text, as seen through core_kernel_text(). This is
required for a subsequent change to ftrace.

Signed-off-by: Naveen N Rao <naveen@kernel.org>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Link: https://patch.msgid.link/20241030070850.1361304-9-hbathini@linux.ibm.com
---

diff --git a/arch/powerpc/kernel/vmlinux.lds.S b/arch/powerpc/kernel/vmlinux.lds.S
index 7ab4e2fb28b1e..b4c9decc7a75c 100644
--- a/arch/powerpc/kernel/vmlinux.lds.S
+++ b/arch/powerpc/kernel/vmlinux.lds.S
@@ -265,14 +265,13 @@ SECTIONS
 	.init.text : AT(ADDR(.init.text) - LOAD_OFFSET) {
 		_sinittext = .;
 		INIT_TEXT
-
+		*(.tramp.ftrace.init);
 		/*
 		 *.init.text might be RO so we must ensure this section ends on
 		 * a page boundary.
 		 */
 		. = ALIGN(PAGE_SIZE);
 		_einittext = .;
-		*(.tramp.ftrace.init);
 	} :text
 
 	/* .exit.text is discarded at runtime, not link time,