diff options
| author | peter <peter@FreeBSD.org> | 2016-05-17 00:24:53 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2016-05-17 00:24:53 +0000 |
| commit | 943e6c971c6fcfca3e04c4a675452d4c4a1b1dc8 (patch) | |
| tree | de9b450234e0944897236e925a7ce3241aa0240a /sys/boot/i386 | |
| parent | ff8f50ec23d3f1798dd94c82f3e56148a16787b0 (diff) | |
| download | FreeBSD-src-943e6c971c6fcfca3e04c4a675452d4c4a1b1dc8.zip FreeBSD-src-943e6c971c6fcfca3e04c4a675452d4c4a1b1dc8.tar.gz | |
Attempt to fix r299660:
slba is used only for the GPT case.
elba is used if either GPT or LOADER_GELI_SUPPORT is enabled.
Diffstat (limited to 'sys/boot/i386')
| -rw-r--r-- | sys/boot/i386/zfsboot/zfsboot.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sys/boot/i386/zfsboot/zfsboot.c b/sys/boot/i386/zfsboot/zfsboot.c index e190b49..e0cc740 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; |
