From 4f152c5b8a307d259945d9a1ada4534b2d5b0d1a Mon Sep 17 00:00:00 2001 From: Toomas Soome Date: Mon, 11 Sep 2017 07:38:53 +0000 Subject: [PATCH] r323389 breaks the kernel build when WITHOUT_ZFS is defined in src.conf Need to add #ifdef EFI_ZFS_BOOT guard into efi/loader/main.c PR: 222215 Reported by: Sylvain Garrigues --- sys/boot/efi/loader/main.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/boot/efi/loader/main.c b/sys/boot/efi/loader/main.c index 00c185cf9655..8ebfab4490e5 100644 --- a/sys/boot/efi/loader/main.c +++ b/sys/boot/efi/loader/main.c @@ -872,16 +872,20 @@ command_chain(int argc, char *argv[]) } if (efi_getdev((void **)&dev, name, (const char **)&path) == 0) { +#ifdef EFI_ZFS_BOOT struct zfs_devdesc *z_dev; +#endif struct disk_devdesc *d_dev; pdinfo_t *hd, *pd; switch (dev->d_type) { +#ifdef EFI_ZFS_BOOT case DEVT_ZFS: z_dev = (struct zfs_devdesc *)dev; loaded_image->DeviceHandle = efizfs_get_handle_by_guid(z_dev->pool_guid); break; +#endif case DEVT_NET: loaded_image->DeviceHandle = efi_find_handle(dev->d_dev, dev->d_unit);