From 119a7e65d8b98e3a622f0e57e84a2eda0405f8e8 Mon Sep 17 00:00:00 2001 From: kevans Date: Thu, 15 Mar 2018 19:31:39 +0000 Subject: MFC r322278,324177: EFIRT Improvements r322278 (imp): Fail to open efirt device when no EFI on system. libefivar expects opening /dev/efi to indicate if the we can make efi runtime calls. With a null routine, it was always succeeding leading efi_variables_supported() to return the wrong value. Only succeed if we have an efi_runtime table. Also, while I'm hear, out of an abundance of caution, add a likely redundant check to make sure efi_systbl is not NULL before dereferencing it. I know it can't be NULL if efi_cfgtbl is non-NULL, but the compiler doesn't. r324177 (andrew): To prepare for adding EFI runtime services support on arm64 move the machine independent parts of the existing code to a new file that can be shared between amd64 and arm64. Care has been taken to ensure that the MFC of r324177 did not clobber cherry-picked MFC's. --- sys/conf/files | 1 + 1 file changed, 1 insertion(+) (limited to 'sys/conf/files') diff --git a/sys/conf/files b/sys/conf/files index a40abde..b8e79cd 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1584,6 +1584,7 @@ dev/ed/if_ed_rtl80x9.c optional ed dev/ed/if_ed_pccard.c optional ed pccard dev/ed/if_ed_pci.c optional ed pci dev/efidev/efidev.c optional efirt +dev/efidev/efirt.c optional efirt dev/eisa/eisa_if.m standard dev/eisa/eisaconf.c optional eisa dev/e1000/if_em.c optional em \ -- cgit v1.1