[Patch v3 3/4] x86/platform/UV: use efi_enabled() instead of test_bit()

From: Hedi Berriche
Date: Wed Feb 13 2019 - 14:34:53 EST

Use ad hoc efi_enabled() instead of fiddling with test_bit().

Cleanup, no functional changes.

Cc: Russ Anderson <rja@xxxxxxx>
Cc: Mike Travis <mike.travis@xxxxxxx>
Cc: Dimitri Sivanich <sivanich@xxxxxxx>
Cc: Steve Wahl <steve.wahl@xxxxxxx>
Cc: stable@xxxxxxxxxxxxxxx # v4.9+
Signed-off-by: Hedi Berriche <hedi.berriche@xxxxxxx>
arch/x86/platform/uv/bios_uv.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/platform/uv/bios_uv.c b/arch/x86/platform/uv/bios_uv.c
index 91e3d5285836..38a2e3431fc6 100644
--- a/arch/x86/platform/uv/bios_uv.c
+++ b/arch/x86/platform/uv/bios_uv.c
@@ -44,7 +44,7 @@ s64 uv_bios_call(enum uv_bios_cmd which, u64 a1, u64 a2, u64 a3, u64 a4, u64 a5)
* If EFI_OLD_MEMMAP is set, we need to fall back to using our old EFI
* callback method, which uses efi_call() directly, with the kernel page tables:
- if (unlikely(test_bit(EFI_OLD_MEMMAP, &efi.flags)))
+ if (unlikely(efi_enabled(EFI_OLD_MEMMAP)))
ret = efi_call((void *)__va(tab->function), (u64)which, a1, a2, a3, a4, a5);
ret = efi_call_virt_pointer(tab, function, (u64)which, a1, a2, a3, a4, a5);