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_ */
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
