2022-12-02 16:47:32

by Jisheng Zhang

Subject: [PATCH next] arm64: alternatives: add __init/__initconst to some functions/variables

apply_alternatives_vdso(), __apply_alternatives_multi_stop() and
kernel_alternatives are not needed after booting, so mark the two
functions as __init and the var as __initconst.

Signed-off-by: Jisheng Zhang <[email protected]>
---
arch/arm64/kernel/alternative.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/arch/arm64/kernel/alternative.c b/arch/arm64/kernel/alternative.c
index 0f5eaa4c3a39..d32d4ed5519b 100644
--- a/arch/arm64/kernel/alternative.c
+++ b/arch/arm64/kernel/alternative.c
@@ -196,7 +196,7 @@ static void __apply_alternatives(const struct alt_region *region,
}
}

-static void apply_alternatives_vdso(void)
+static void __init apply_alternatives_vdso(void)
{
struct alt_region region;
const struct elf64_hdr *hdr;
@@ -220,7 +220,7 @@ static void apply_alternatives_vdso(void)
__apply_alternatives(&region, false, &all_capabilities[0]);
}

-static const struct alt_region kernel_alternatives = {
+static const struct alt_region kernel_alternatives __initconst = {
.begin = (struct alt_instr *)__alt_instructions,
.end = (struct alt_instr *)__alt_instructions_end,
};
@@ -229,7 +229,7 @@ static const struct alt_region kernel_alternatives = {
* We might be patching the stop_machine state machine, so implement a
* really simple polling protocol here.
*/
-static int __apply_alternatives_multi_stop(void *unused)
+static int __init __apply_alternatives_multi_stop(void *unused)
{
/* We always have a CPU 0 at this point (__init) */
if (smp_processor_id()) {
--
2.38.1

2022-12-05 17:06:16

by Will Deacon

Subject: Re: [PATCH next] arm64: alternatives: add __init/__initconst to some functions/variables

On Sat, 3 Dec 2022 00:18:59 +0800, Jisheng Zhang wrote:
> apply_alternatives_vdso(), __apply_alternatives_multi_stop() and
> kernel_alternatives are not needed after booting, so mark the two
> functions as __init and the var as __initconst.
>
>

Applied to arm64 (for-next/trivial), thanks!

[1/1] arm64: alternatives: add __init/__initconst to some functions/variables
https://git.kernel.org/arm64/c/67bc5b2d6d48

Cheers,
--
Will

https://fixes.arm64.dev
https://next.arm64.dev
https://will.arm64.dev