summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/amd64/amd64/machdep.c4
-rw-r--r--sys/sys/efi.h5
2 files changed, 6 insertions, 3 deletions
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c
index 05b75dd..8aa21bb 100644
--- a/sys/amd64/amd64/machdep.c
+++ b/sys/amd64/amd64/machdep.c
@@ -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 modulep)
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);
}
diff --git a/sys/sys/efi.h b/sys/sys/efi.h
index 4ac3402..50f4abe 100644
--- a/sys/sys/efi.h
+++ b/sys/sys/efi.h
@@ -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_ */
OpenPOWER on IntegriCloud