Date: Sat, 7 Oct 2017 17:40:31 +0000 (UTC) From: Ngie Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r324388 - head/sys/boot/efi/loader Message-ID: <201710071740.v97HeV0W094885@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Sat Oct 7 17:40:31 2017 New Revision: 324388 URL: https://svnweb.freebsd.org/changeset/base/324388 Log: Unbreak building efiboot with MK_ZFS == no Wrap `efi_zfs_is_preferred` with `#ifdef EFI_ZFS_BOOT`. Reported by: Guy Yur <guyyur@gmail.com> Modified: head/sys/boot/efi/loader/main.c Modified: head/sys/boot/efi/loader/main.c ============================================================================== --- head/sys/boot/efi/loader/main.c Sat Oct 7 17:32:39 2017 (r324387) +++ head/sys/boot/efi/loader/main.c Sat Oct 7 17:40:31 2017 (r324388) @@ -74,12 +74,13 @@ EFI_GUID inputid = SIMPLE_TEXT_INPUT_PROTOCOL; static EFI_LOADED_IMAGE *img; +#ifdef EFI_ZFS_BOOT bool efi_zfs_is_preferred(EFI_HANDLE *h) { return (h == img->DeviceHandle); } - +#endif static int has_keyboard(void)
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201710071740.v97HeV0W094885>