Commit dbc1f5a9 authored by Linus Torvalds's avatar Linus Torvalds

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
...@@ -476,8 +476,8 @@ static bool __init vmware_legacy_x2apic_available(void) ...@@ -476,8 +476,8 @@ static bool __init vmware_legacy_x2apic_available(void)
{ {
uint32_t eax, ebx, ecx, edx; uint32_t eax, ebx, ecx, edx;
VMWARE_CMD(GETVCPU_INFO, eax, ebx, ecx, edx); VMWARE_CMD(GETVCPU_INFO, eax, ebx, ecx, edx);
return (eax & (1 << VMWARE_CMD_VCPU_RESERVED)) == 0 && return !(eax & BIT(VMWARE_CMD_VCPU_RESERVED)) &&
(eax & (1 << VMWARE_CMD_LEGACY_X2APIC)) != 0; (eax & BIT(VMWARE_CMD_LEGACY_X2APIC));
} }
#ifdef CONFIG_AMD_MEM_ENCRYPT #ifdef CONFIG_AMD_MEM_ENCRYPT
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment