Commit dbc1f5a9 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'x86_vmware_for_v6.0_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull x86 vmware cleanup from Borislav Petkov:

 - A single statement simplification by using the BIT() macro

* tag 'x86_vmware_for_v6.0_rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  x86/vmware: Use BIT() macro for shifting
parents 296d3b3e 4745ca43

arch/x86/kernel/cpu/vmware.c

+2 −2
Original line number Diff line number Diff line
@@ -476,8 +476,8 @@ static bool __init vmware_legacy_x2apic_available(void) 
{

	uint32_t eax, ebx, ecx, edx;

	VMWARE_CMD(GETVCPU_INFO, eax, ebx, ecx, edx);

	return (eax & (1 << VMWARE_CMD_VCPU_RESERVED)) == 0 &&

	       (eax & (1 << VMWARE_CMD_LEGACY_X2APIC)) != 0;

	return !(eax & BIT(VMWARE_CMD_VCPU_RESERVED)) &&

		(eax & BIT(VMWARE_CMD_LEGACY_X2APIC));

}



#ifdef CONFIG_AMD_MEM_ENCRYPT