Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 55a36b65 authored by Borislav Petkov's avatar Borislav Petkov
Browse files

x86: Fold-in trivial check_config function 



Fold it into its single call site. No functionality change.

Signed-off-by: default avatarBorislav Petkov <bp@suse.de>
Link: http://lkml.kernel.org/r/1365436666-9837-3-git-send-email-bp@alien8.de


Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 7d7dc116

arch/x86/kernel/cpu/bugs.c

+11 −16
Original line number Diff line number Diff line
@@ -81,6 +81,14 @@ static void __init check_fpu(void) 
	}

}



void __init check_bugs(void)

{

	identify_boot_cpu();

#ifndef CONFIG_SMP

	pr_info("CPU: ");

	print_cpu_info(&boot_cpu_data);

#endif



	/*

	 * Check whether we are able to run this kernel safely on SMP.

	 *
@@ -88,22 +96,9 @@ static void __init check_fpu(void) 
	 * - In order to run on anything without a TSC, we need to be

	 *   compiled for a i486.

	 */



static void __init check_config(void)

{

	if (boot_cpu_data.x86 < 4)

		panic("Kernel requires i486+ for 'invlpg' and other features");

}





void __init check_bugs(void)

{

	identify_boot_cpu();

#ifndef CONFIG_SMP

	pr_info("CPU: ");

	print_cpu_info(&boot_cpu_data);

#endif

	check_config();

	init_utsname()->machine[1] =

		'0' + (boot_cpu_data.x86 > 6 ? 6 : boot_cpu_data.x86);

	alternative_instructions();