From owner-svn-src-stable-11@freebsd.org  Wed Sep 28 09:51:09 2016
Return-Path: <owner-svn-src-stable-11@freebsd.org>
Delivered-To: svn-src-stable-11@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 32C95BE83C0;
 Wed, 28 Sep 2016 09:51:09 +0000 (UTC) (envelope-from kib@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 F419118E5;
 Wed, 28 Sep 2016 09:51:08 +0000 (UTC) (envelope-from kib@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u8S9p8AZ084011;
 Wed, 28 Sep 2016 09:51:08 GMT (envelope-from kib@FreeBSD.org)
Received: (from kib@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8S9p8As084009;
 Wed, 28 Sep 2016 09:51:08 GMT (envelope-from kib@FreeBSD.org)
Message-Id: <201609280951.u8S9p8As084009@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org
 using -f
From: Konstantin Belousov <kib@FreeBSD.org>
Date: Wed, 28 Sep 2016 09:51:08 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r306405 - in stable/11/sys: amd64/amd64 sys
X-SVN-Group: stable-11
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-11@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for only the 11-stable src tree
 <svn-src-stable-11.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-11/>
List-Post: <mailto:svn-src-stable-11@freebsd.org>
List-Help: <mailto:svn-src-stable-11-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-11>, 
 <mailto:svn-src-stable-11-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 28 Sep 2016 09:51:09 -0000

Author: kib
Date: Wed Sep 28 09:51:07 2016
New Revision: 306405
URL: https://svnweb.freebsd.org/changeset/base/306405

Log:
  MFC r306092:
  Rename efi_systbl to efi_systbl_phys.

Modified:
  stable/11/sys/amd64/amd64/machdep.c
  stable/11/sys/sys/efi.h
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/sys/amd64/amd64/machdep.c
==============================================================================
--- stable/11/sys/amd64/amd64/machdep.c	Wed Sep 28 09:48:39 2016	(r306404)
+++ stable/11/sys/amd64/amd64/machdep.c	Wed Sep 28 09:51:07 2016	(r306405)
@@ -192,7 +192,7 @@ struct msgbuf *msgbufp;
  * Physical address of the EFI System Table. Stashed from the metadata hints
  * passed into the kernel and used by the EFI code to call runtime services.
  */
-vm_paddr_t efi_systbl;
+vm_paddr_t efi_systbl_phys;
 
 /* Intel ICH registers */
 #define ICH_PMBASE	0x400
@@ -1502,7 +1502,7 @@ native_parse_preload_data(u_int64_t modu
 	ksym_end = MD_FETCH(kmdp, MODINFOMD_ESYM, uintptr_t);
 	db_fetch_ksymtab(ksym_start, ksym_end);
 #endif
-	efi_systbl = MD_FETCH(kmdp, MODINFOMD_FW_HANDLE, vm_paddr_t);
+	efi_systbl_phys = MD_FETCH(kmdp, MODINFOMD_FW_HANDLE, vm_paddr_t);
 
 	return (kmdp);
 }

Modified: stable/11/sys/sys/efi.h
==============================================================================
--- stable/11/sys/sys/efi.h	Wed Sep 28 09:48:39 2016	(r306404)
+++ stable/11/sys/sys/efi.h	Wed Sep 28 09:51:07 2016	(r306405)
@@ -158,5 +158,8 @@ struct efi_systbl {
 	uint64_t	st_cfgtbl;
 };
 
-extern vm_paddr_t efi_systbl;
+#ifdef _KERNEL
+extern vm_paddr_t efi_systbl_phys;
+#endif	/* _KERNEL */
+
 #endif /* _SYS_EFI_H_ */