From owner-svn-src-head@freebsd.org  Fri May 13 11:20:22 2016
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id F3486B39FCD;
 Fri, 13 May 2016 11:20:22 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C3EC31025;
 Fri, 13 May 2016 11:20:22 +0000 (UTC)
 (envelope-from ngie@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u4DBKLPF015861;
 Fri, 13 May 2016 11:20:21 GMT (envelope-from ngie@FreeBSD.org)
Received: (from ngie@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u4DBKLcQ015860;
 Fri, 13 May 2016 11:20:21 GMT (envelope-from ngie@FreeBSD.org)
Message-Id: <201605131120.u4DBKLcQ015860@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: ngie set sender to
 ngie@FreeBSD.org using -f
From: Garrett Cooper <ngie@FreeBSD.org>
Date: Fri, 13 May 2016 11:20:21 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r299660 - head/sys/boot/i386/zfsboot
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.22
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 13 May 2016 11:20:23 -0000

Author: ngie
Date: Fri May 13 11:20:21 2016
New Revision: 299660
URL: https://svnweb.freebsd.org/changeset/base/299660

Log:
  Put slba and elba under LOADER_GELI_SUPPORT ifdef to mute warning about them being
  unused in the non-GELI case
  
  MFC after: 1 week
  Reported by: clang
  Sponsored by: EMC / Isilon Storage Division

Modified:
  head/sys/boot/i386/zfsboot/zfsboot.c

Modified: head/sys/boot/i386/zfsboot/zfsboot.c
==============================================================================
--- head/sys/boot/i386/zfsboot/zfsboot.c	Fri May 13 11:18:29 2016	(r299659)
+++ head/sys/boot/i386/zfsboot/zfsboot.c	Fri May 13 11:20:21 2016	(r299660)
@@ -398,7 +398,9 @@ probe_drive(struct dsk *dsk)
     struct gpt_ent *ent;
     unsigned part, entries_per_sec;
 #endif
+#ifdef LOADER_GELI_SUPPORT
     daddr_t slba, elba;
+#endif
     struct dos_partition *dp;
     char *sec;
     unsigned i;