Date: Mon, 11 Sep 2017 07:38:53 +0000 (UTC) From: Toomas Soome <tsoome@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r323428 - head/sys/boot/efi/loader Message-ID: <201709110738.v8B7crWh096502@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: tsoome Date: Mon Sep 11 07:38:53 2017 New Revision: 323428 URL: https://svnweb.freebsd.org/changeset/base/323428 Log: 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 Modified: head/sys/boot/efi/loader/main.c Modified: head/sys/boot/efi/loader/main.c ============================================================================== --- head/sys/boot/efi/loader/main.c Mon Sep 11 07:24:56 2017 (r323427) +++ head/sys/boot/efi/loader/main.c Mon Sep 11 07:38:53 2017 (r323428) @@ -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);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201709110738.v8B7crWh096502>