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

torvalds · torvalds · commit dbc1f5a9f42a · 2022-08-01T09:31:49.000-07:00
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
diff --git a/arch/x86/kernel/cpu/vmware.c b/arch/x86/kernel/cpu/vmware.c
@@ -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

Original file line number	Diff line number	Diff line change
`@@ -476,8 +476,8 @@ static bool __init vmware_legacy_x2apic_available(void)`
`476`	`476`	`{`
`477`	`477`	`uint32_t eax, ebx, ecx, edx;`
`478`	`478`	`VMWARE_CMD(GETVCPU_INFO, eax, ebx, ecx, edx);`
`479`		`- return (eax & (1 << VMWARE_CMD_VCPU_RESERVED)) == 0 &&`
`480`		`- (eax & (1 << VMWARE_CMD_LEGACY_X2APIC)) != 0;`
	`479`	`+ return !(eax & BIT(VMWARE_CMD_VCPU_RESERVED)) &&`
	`480`	`+ (eax & BIT(VMWARE_CMD_LEGACY_X2APIC));`
`481`	`481`	`}`
`482`	`482`
`483`	`483`	`#ifdef CONFIG_AMD_MEM_ENCRYPT`