Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

As suggested by christos@, use KASSERTMSG()

This commit is contained in:
pgoyette 2016-07-15 01:13:10 +00:00
parent d854f54539
commit abd2da1923
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sys/kern/subr_autoconf.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: subr_autoconf.c,v 1.244 2016/07/14 21:57:06 pgoyette Exp $ */
/* $NetBSD: subr_autoconf.c,v 1.245 2016/07/15 01:13:10 pgoyette Exp $ */
/*
* Copyright (c) 1996, 2000 Christopher G. Demetriou
@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.244 2016/07/14 21:57:06 pgoyette Exp $");
__KERNEL_RCSID(0, "$NetBSD: subr_autoconf.c,v 1.245 2016/07/15 01:13:10 pgoyette Exp $");
#ifdef _KERNEL_OPT
#include "opt_ddb.h"
@ -1370,8 +1370,10 @@ config_devalloc(const device_t parent, const cfdata_t cf, const int *locs)
return NULL;
/* get memory for all device vars */
KASSERT((ca->ca_flags & DVF_PRIV_ALLOC)
|| ca->ca_devsize >= sizeof(struct device));
KASSERTMSG((ca->ca_flags & DVF_PRIV_ALLOC)
|| ca->ca_devsize >= sizeof(struct device),
"config_devalloc: %s (%zu < %zu)", cf->cf_atname, ca->ca_devsize,
sizeof(struct device));
if (ca->ca_devsize > 0) {
dev_private = kmem_zalloc(ca->ca_devsize, KM_SLEEP);
if (dev_private == NULL)