Author: jhb
Date: Thu Dec 18 23:00:17 2014
New Revision: 275921
URL: https://svnweb.freebsd.org/changeset/base/275921
Log:
MFC 273871:
Skip the smap sysctl instead of panicing if no kernel metadata can be
found.
Modified:
stable/10/sys/i386/i386/machdep.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/i386/i386/machdep.c
==============================================================================
--- stable/10/sys/i386/i386/machdep.c Thu Dec 18 22:32:22 2014
(r275920)
+++ stable/10/sys/i386/i386/machdep.c Thu Dec 18 23:00:17 2014
(r275921)
@@ -3117,6 +3117,8 @@ smap_sysctl_handler(SYSCTL_HANDLER_ARGS)
kmdp = preload_search_by_type("elf kernel");
if (kmdp == NULL)
kmdp = preload_search_by_type("elf32 kernel");
+ if (kmdp == NULL)
+ return (0);
smapbase = (struct bios_smap *)preload_search_info(kmdp,
MODINFO_METADATA | MODINFOMD_SMAP);
if (smapbase == NULL)
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
