From 943e6c971c6fcfca3e04c4a675452d4c4a1b1dc8 Mon Sep 17 00:00:00 2001
From: peter <peter@FreeBSD.org>
Date: Tue, 17 May 2016 00:24:53 +0000
Subject: [PATCH] Attempt to fix r299660: slba is used only for the GPT case.
 elba is used if either GPT or LOADER_GELI_SUPPORT is enabled.

---
 sys/boot/i386/zfsboot/zfsboot.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sys/boot/i386/zfsboot/zfsboot.c b/sys/boot/i386/zfsboot/zfsboot.c
index e190b4933ed3..e0cc740c02e6 100644
--- 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;