x86/microcode: Remove local vendor variable (7a93a40b) · Commits · 戴 / test

arch/x86/kernel/cpu/microcode/core.c

+4 −6

Original line number	Original line	Diff line number	Diff line
	@@ -122,15 +122,14 @@ bool get_builtin_firmware(struct cpio_data cd, const char name)

	void __init load_ucode_bsp(void)		void __init load_ucode_bsp(void)
	{		{
	unsigned int vendor, cpuid_1_eax;		unsigned int cpuid_1_eax;

	if (check_loader_disabled_bsp())		if (check_loader_disabled_bsp())
	return;		return;

	vendor = x86_cpuid_vendor();
	cpuid_1_eax = native_cpuid_eax(1);		cpuid_1_eax = native_cpuid_eax(1);

	switch (vendor) {		switch (x86_cpuid_vendor()) {
	case X86_VENDOR_INTEL:		case X86_VENDOR_INTEL:
	if (x86_family(cpuid_1_eax) >= 6)		if (x86_family(cpuid_1_eax) >= 6)
	load_ucode_intel_bsp();		load_ucode_intel_bsp();
	@@ -155,15 +154,14 @@ static bool check_loader_disabled_ap(void)

	void load_ucode_ap(void)		void load_ucode_ap(void)
	{		{
	unsigned int vendor, cpuid_1_eax;		unsigned int cpuid_1_eax;

	if (check_loader_disabled_ap())		if (check_loader_disabled_ap())
	return;		return;

	vendor = x86_cpuid_vendor();
	cpuid_1_eax = native_cpuid_eax(1);		cpuid_1_eax = native_cpuid_eax(1);

	switch (vendor) {		switch (x86_cpuid_vendor()) {
	case X86_VENDOR_INTEL:		case X86_VENDOR_INTEL:
	if (x86_family(cpuid_1_eax) >= 6)		if (x86_family(cpuid_1_eax) >= 6)
	load_ucode_intel_ap();		load_ucode_intel_ap();