x86/platform/UV: Use efi_enabled() instead of test_bit()

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

Cleanup, no functional changes.

Signed-off-by: Hedi Berriche <[email protected]>
Signed-off-by: Borislav Petkov <[email protected]>
Reviewed-by: Ard Biesheuvel <[email protected]>
Reviewed-by: Russ Anderson <[email protected]>
Reviewed-by: Dimitri Sivanich <[email protected]>
Reviewed-by: Mike Travis <[email protected]>
Cc: Andy Shevchenko <[email protected]>
Cc: Bhupesh Sharma <[email protected]>
Cc: Darren Hart <[email protected]>
Cc: "H. Peter Anvin" <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: linux-efi <[email protected]>
Cc: [email protected]
Cc: Steve Wahl <[email protected]>
Cc: Thomas Gleixner <[email protected]>
Cc: x86-ml <[email protected]>
Link: https://lkml.kernel.org/r/[email protected]

diff --git a/arch/x86/platform/uv/bios_uv.c b/arch/x86/platform/uv/bios_uv.c
index 91e3d5285836262370df71b5b2b8654dce3427c1..38a2e3431fc697428236454d714c56cad8060e61 100644 (file)
--- 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);
        else
                ret = efi_call_virt_pointer(tab, function, (u64)which, a1, a2, a3, a4, a5);