diff options
| author | kib <kib@FreeBSD.org> | 2016-09-28 09:51:07 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2016-09-28 09:51:07 +0000 |
| commit | 287376aa3f49ff4ad12d60f352e461f58d0a1a2a (patch) | |
| tree | 5f9c823e8e385d0f77ab50e6cf0295cd73ab743d | |
| parent | 6316bb62bba68e7ac69b249c98fd679530915a68 (diff) | |
| download | FreeBSD-src-287376aa3f49ff4ad12d60f352e461f58d0a1a2a.zip FreeBSD-src-287376aa3f49ff4ad12d60f352e461f58d0a1a2a.tar.gz | |
MFC r306092:
Rename efi_systbl to efi_systbl_phys.
| -rw-r--r-- | sys/amd64/amd64/machdep.c | 4 | ||||
| -rw-r--r-- | sys/sys/efi.h | 5 |
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_ */ |
