Attempt to fix r299660:

slba is used only for the GPT case. elba is used if either GPT or LOADER_GELI_SUPPORT is enabled.
2016-05-17 00:24:53 +00:00 · 2016-05-17 00:24:53 +00:00 · 943e6c971c
commit 943e6c971c
parent ff8f50ec23
1 changed files with 4 additions and 2 deletions
--- a/sys/boot/i386/zfsboot/zfsboot.c
+++ b/sys/boot/i386/zfsboot/zfsboot.c
@ -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;