Commit 38d43f61 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by Aichun Shi
Browse files

x86/fpu: Mark init functions __init 

stable inclusion
from stable-v5.10.189
commit 2462bc3ef0611646d94658ff250bb16669347361
category: bugfix
bugzilla: https://gitee.com/openeuler/intel-kernel/issues/I8LVBS
CVE: N/A
Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=2462bc3ef0611646d94658ff250bb16669347361



-------------------------------------

Intel-SIG: commit 2462bc3ef061 ("x86/fpu: Mark init functions __init")
Backport x86 related patches from 5.10.189 upstream

-------------------------------------

commit 1703db2b upstream

No point in keeping them around.

Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Link: https://lore.kernel.org/r/20230613224545.841685728@linutronix.de


Signed-off-by: default avatarDaniel Sneddon <daniel.sneddon@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarAichun Shi <aichun.shi@intel.com>
parent cc1822a7

arch/x86/kernel/fpu/init.c

+2 −2
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ void fpu__init_cpu(void) 
	fpu__init_cpu_xstate();

}



static bool fpu__probe_without_cpuid(void)

static bool __init fpu__probe_without_cpuid(void)

{

	unsigned long cr0;

	u16 fsw, fcw;
@@ -71,7 +71,7 @@ static bool fpu__probe_without_cpuid(void) 
	return fsw == 0 && (fcw & 0x103f) == 0x003f;

}



static void fpu__init_system_early_generic(void)

static void __init fpu__init_system_early_generic(void)

{

	if (!boot_cpu_has(X86_FEATURE_CPUID) &&

	    !test_bit(X86_FEATURE_FPU, (unsigned long *)cpu_caps_cleared)) {