diff options
| author | kib <kib@FreeBSD.org> | 2017-05-20 16:12:44 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2017-05-20 16:12:44 +0000 |
| commit | f954c5056d909af5d65546fe9bce8951fdae0b70 (patch) | |
| tree | 6e26ea5d1ee32f63a09c90b6e14accc3eac6e847 /sys/amd64 | |
| parent | 78abf039aa297d9b0021f82c669f194c4bfc611e (diff) | |
| download | FreeBSD-src-f954c5056d909af5d65546fe9bce8951fdae0b70.zip FreeBSD-src-f954c5056d909af5d65546fe9bce8951fdae0b70.tar.gz | |
MFC efivar(8) (by imp):
List of revisions merged:
r307070
r307071
r307072
r307074
r307189
r307224
r307339
r307390
r307391
r309776
r314231
r314232
r314615
r314616
r314617
r314618
r314619
r314620
r314621
r314623
r314890
r314925
r314926
r314927
r314928
r315770
r315771
Discussed with: gjb (re), imp
Sponsored by: The FreeBSD Foundation
Diffstat (limited to 'sys/amd64')
| -rw-r--r-- | sys/amd64/amd64/efirt.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/sys/amd64/amd64/efirt.c b/sys/amd64/amd64/efirt.c index 8db768b..db40cdf 100644 --- a/sys/amd64/amd64/efirt.c +++ b/sys/amd64/amd64/efirt.c @@ -355,14 +355,14 @@ efi_init(void) if (efi_systbl_phys == 0) { if (bootverbose) printf("EFI systbl not available\n"); - return (ENXIO); + return (0); } efi_systbl = (struct efi_systbl *)PHYS_TO_DMAP(efi_systbl_phys); if (efi_systbl->st_hdr.th_sig != EFI_SYSTBL_SIG) { efi_systbl = NULL; if (bootverbose) printf("EFI systbl signature invalid\n"); - return (ENXIO); + return (0); } efi_cfgtbl = (efi_systbl->st_cfgtbl == 0) ? NULL : (struct efi_cfgtbl *)efi_systbl->st_cfgtbl; @@ -379,7 +379,7 @@ efi_init(void) if (efihdr == NULL) { if (bootverbose) printf("EFI map is not present\n"); - return (ENXIO); + return (0); } efisz = (sizeof(struct efi_map_header) + 0xf) & ~0xf; map = (struct efi_md *)((uint8_t *)efihdr + efisz); @@ -563,7 +563,6 @@ efirt_modevents(module_t m, int event, void *arg __unused) switch (event) { case MOD_LOAD: return (efi_init()); - break; case MOD_UNLOAD: efi_uninit(); |
