Author: peter
Date: Tue May 17 00:24:53 2016
New Revision: 299997
URL: https://svnweb.freebsd.org/changeset/base/299997
Log:
Attempt to fix r299660:
slba is used only for the GPT case.
elba is used if either GPT or LOADER_GELI_SUPPORT is enabled.
Modified:
head/sys/boot/i386/zfsboot/zfsboot.c
Modified: head/sys/boot/i386/zfsboot/zfsboot.c
==============================================================================
--- head/sys/boot/i386/zfsboot/zfsboot.c Tue May 17 00:23:46 2016
(r299996)
+++ head/sys/boot/i386/zfsboot/zfsboot.c Tue May 17 00:24:53 2016
(r299997)
@@ -397,10 +397,12 @@ probe_drive(struct dsk *dsk)
struct gpt_hdr hdr;
struct gpt_ent *ent;
unsigned part, entries_per_sec;
+ daddr_t slba;
#endif
-#ifdef LOADER_GELI_SUPPORT
- daddr_t slba, elba;
+#if defined(GPT) || defined(LOADER_GELI_SUPPORT)
+ daddr_t elba;
#endif
+
struct dos_partition *dp;
char *sec;
unsigned i;
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
