d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

r323389 breaks the kernel build when WITHOUT_ZFS is defined in src.conf

Browse Source 
Need to add #ifdef EFI_ZFS_BOOT guard into efi/loader/main.c

PR:		222215
Reported by:	Sylvain Garrigues
This commit is contained in:
Toomas Soome 2017-09-11 07:38:53 +00:00
parent 3c5ac992c7
commit 4f152c5b8a
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sys/boot/efi/loader/main.c
View File

@ -872,16 +872,20 @@ command_chain(int argc, char *argv[])
} }
if (efi_getdev((void **)&dev, name, (const char **)&path) == 0) { if (efi_getdev((void **)&dev, name, (const char **)&path) == 0) {
#ifdef EFI_ZFS_BOOT
struct zfs_devdesc *z_dev; struct zfs_devdesc *z_dev;
#endif
struct disk_devdesc *d_dev; struct disk_devdesc *d_dev;
pdinfo_t *hd, *pd; pdinfo_t *hd, *pd;
switch (dev->d_type) { switch (dev->d_type) {
#ifdef EFI_ZFS_BOOT
case DEVT_ZFS: case DEVT_ZFS:
z_dev = (struct zfs_devdesc *)dev; z_dev = (struct zfs_devdesc *)dev;
loaded_image->DeviceHandle = loaded_image->DeviceHandle =
efizfs_get_handle_by_guid(z_dev->pool_guid); efizfs_get_handle_by_guid(z_dev->pool_guid);
break; break;
#endif
case DEVT_NET: case DEVT_NET:
loaded_image->DeviceHandle = loaded_image->DeviceHandle =
efi_find_handle(dev->d_dev, dev->d_unit); efi_find_handle(dev->d_dev, dev->d_unit);