From b47228854f604dd0263a3545a17c7b02eb430d8b Mon Sep 17 00:00:00 2001 From: Ed Maste Date: Tue, 22 Jul 2014 13:58:33 +0000 Subject: [PATCH] Don't pass null kmdp to preload_search_info On Xen PVH guests kmdp == NULL. Submitted by: royger MFC after: 3 days Sponsored by: The FreeBSD Foundation --- sys/amd64/amd64/machdep.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index 5afd58cd685..f02045d6414 100644 --- a/sys/amd64/amd64/machdep.c +++ b/sys/amd64/amd64/machdep.c @@ -1958,8 +1958,8 @@ hammer_time(u_int64_t modulep, u_int64_t physfree) * Use vt(4) by default for UEFI boot (during the sc(4)/vt(4) * transition). */ - if (preload_search_info(kmdp, MODINFO_METADATA | MODINFOMD_EFI_MAP) != - NULL) + if (kmdp != NULL && preload_search_info(kmdp, + MODINFO_METADATA | MODINFOMD_EFI_MAP) != NULL) vty_set_preferred(VTY_VT); /*