svn commit: r268982 - head/sys/amd64/amd64

Ed Maste emaste at FreeBSD.org
Tue Jul 22 13:58:34 UTC 2014


Author: emaste
Date: Tue Jul 22 13:58:33 2014
New Revision: 268982
URL: http://svnweb.freebsd.org/changeset/base/268982

Log:
  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

Modified:
  head/sys/amd64/amd64/machdep.c

Modified: head/sys/amd64/amd64/machdep.c
==============================================================================
--- head/sys/amd64/amd64/machdep.c	Tue Jul 22 08:52:49 2014	(r268981)
+++ head/sys/amd64/amd64/machdep.c	Tue Jul 22 13:58:33 2014	(r268982)
@@ -1958,8 +1958,8 @@ hammer_time(u_int64_t modulep, u_int64_t
 	 * 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);
 
 	/*


More information about the svn-src-head mailing list