Commit-ID: 8945d96f7b3ead56e053ac79b8f7b0de98a30bfe Gitweb: https://git.kernel.org/tip/8945d96f7b3ead56e053ac79b8f7b0de98a30bfe Author: Hedi Berriche <hedi.berri...@hpe.com> AuthorDate: Wed, 13 Feb 2019 19:34:12 +0000 Committer: Borislav Petkov <b...@suse.de> CommitDate: Fri, 15 Feb 2019 15:15:18 +0100
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 <hedi.berri...@hpe.com> Signed-off-by: Borislav Petkov <b...@suse.de> Reviewed-by: Ard Biesheuvel <ard.biesheu...@linaro.org> Reviewed-by: Russ Anderson <r...@hpe.com> Reviewed-by: Dimitri Sivanich <sivan...@hpe.com> Reviewed-by: Mike Travis <mike.tra...@hpe.com> Cc: Andy Shevchenko <a...@infradead.org> Cc: Bhupesh Sharma <bhsha...@redhat.com> Cc: Darren Hart <dvh...@infradead.org> Cc: "H. Peter Anvin" <h...@zytor.com> Cc: Ingo Molnar <mi...@redhat.com> Cc: linux-efi <linux-...@vger.kernel.org> Cc: platform-driver-...@vger.kernel.org Cc: Steve Wahl <steve.w...@hpe.com> Cc: Thomas Gleixner <t...@linutronix.de> Cc: x86-ml <x...@kernel.org> Link: https://lkml.kernel.org/r/20190213193413.25560-4-hedi.berri...@hpe.com --- 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); else ret = efi_call_virt_pointer(tab, function, (u64)which, a1, a2, a3, a4, a5);
