diff options
| author | emaste <emaste@FreeBSD.org> | 2014-07-22 13:58:33 +0000 |
|---|---|---|
| committer | emaste <emaste@FreeBSD.org> | 2014-07-22 13:58:33 +0000 |
| commit | 56b12303b39ff7cae687b8200156dcf50a31eb3f (patch) | |
| tree | 7a9126904fd4464af9a96fa77aa7db6da561d890 /sys/amd64 | |
| parent | 47745117ddce249e98eb292d9b6ff97a3f3c3017 (diff) | |
| download | FreeBSD-src-56b12303b39ff7cae687b8200156dcf50a31eb3f.zip FreeBSD-src-56b12303b39ff7cae687b8200156dcf50a31eb3f.tar.gz | |
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
Diffstat (limited to 'sys/amd64')
| -rw-r--r-- | sys/amd64/amd64/machdep.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/amd64/amd64/machdep.c b/sys/amd64/amd64/machdep.c index 5afd58c..f02045d 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); /* |
