Skip to content

Commit 1b76bc2

Browse files
committed
Merge: x86/entry: Add __init to ia32_emulation_override_cmdline()
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/6718 JIRA: https://issues.redhat.com/browse/RHEL-52969 upstream ======== commit b2f10aa Author: Vitaly Kuznetsov <[email protected]> Date: Tue Dec 10 16:16:50 2024 +0100 description =========== ia32_emulation_override_cmdline() is an early_param() arg and these are only needed at boot time. In fact, all other early_param() functions in arch/x86 seem to have '__init' annotation and ia32_emulation_override_cmdline() is the only exception. Fixes: a11e097 ("x86: Make IA32_EMULATION boot time configurable") Signed-off-by: Vitaly Kuznetsov <[email protected]> Signed-off-by: Dave Hansen <[email protected]> Reviewed-by: Nikolay Borisov <[email protected]> Link: https://lore.kernel.org/all/20241210151650.1746022-1-vkuznets%40redhat.com Signed-off-by: Michael Petlan <[email protected]> Approved-by: Vitaly Kuznetsov <[email protected]> Approved-by: Steve Best <[email protected]> Approved-by: CKI KWF Bot <[email protected]> Merged-by: Augusto Caringi <[email protected]>
2 parents 67a2a9a + ca80097 commit 1b76bc2

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

arch/x86/entry/common.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ static __always_inline int syscall_32_enter(struct pt_regs *regs)
142142
#ifdef CONFIG_IA32_EMULATION
143143
bool __ia32_enabled __ro_after_init = !IS_ENABLED(CONFIG_IA32_EMULATION_DEFAULT_DISABLED);
144144

145-
static int ia32_emulation_override_cmdline(char *arg)
145+
static int __init ia32_emulation_override_cmdline(char *arg)
146146
{
147147
return kstrtobool(arg, &__ia32_enabled);
148148
}

0 commit comments

Comments
 (0)