Author: kib
Date: Wed Sep 21 10:55:28 2016
New Revision: 306092
URL: https://svnweb.freebsd.org/changeset/base/306092
Log:
Rename efi_systbl to efi_systbl_phys, the variable contains the
physical address of the EFI System Table. Add _KERNEL guard around
its declaration in sys/efi.h.
Sponsored by: The FreeBSD Foundation
MFC after: 1 week
Modified:
head/sys/amd64/amd64/machdep.c
head/sys/sys/efi.h
Modified: head/sys/amd64/amd64/machdep.c
==============================================================================
--- head/sys/amd64/amd64/machdep.c Wed Sep 21 10:35:44 2016
(r306091)
+++ head/sys/amd64/amd64/machdep.c Wed Sep 21 10:55:28 2016
(r306092)
@@ -188,7 +188,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
@@ -1501,7 +1501,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: head/sys/sys/efi.h
==============================================================================
--- head/sys/sys/efi.h Wed Sep 21 10:35:44 2016 (r306091)
+++ head/sys/sys/efi.h Wed Sep 21 10:55:28 2016 (r306092)
@@ -163,5 +163,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_ */
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
