Date: Sat, 26 Dec 2020 07:52:01 GMT From: Michal Meloun <mmel@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: 9211df29150d - MFC r366192: Message-ID: <202012260752.0BQ7q1LY065555@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by mmel: URL: https://cgit.FreeBSD.org/src/commit/?id=9211df29150df659ded5716c86ce3d9e78cc36e4 commit 9211df29150df659ded5716c86ce3d9e78cc36e4 Author: Michal Meloun <mmel@FreeBSD.org> AuthorDate: 2020-09-27 09:12:36 +0000 Commit: Michal Meloun <mmel@FreeBSD.org> CommitDate: 2020-12-26 07:38:16 +0000 MFC r366192: Don't try to print EFI memeory map if it doesn't exist. (cherry picked from commit 0e417b55d56639a1e9bc4062dfe8020b621899c7) --- sys/arm64/arm64/machdep.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c index e78e998fd0a1..90a2659d9521 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -1119,7 +1119,8 @@ initarm(struct arm64_bootparams *abp) strlcpy(kernelname, env, sizeof(kernelname)); if (boothowto & RB_VERBOSE) { - print_efi_map_entries(efihdr); + if (efihdr != NULL) + print_efi_map_entries(efihdr); physmem_print_tables(); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012260752.0BQ7q1LY065555>