Module Name: src
Committed By: martin
Date: Tue Nov 11 12:50:48 UTC 2014
Modified Files:
src/sys/dev/wscons [netbsd-7]: wsdisplay_vcons.c
Log Message:
Pull up following revision(s) (requested by jmcneill in ticket #212):
sys/dev/wscons/wsdisplay_vcons.c: revision 1.33
allocate char and attr buffers with M_ZERO
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.32.4.1 src/sys/dev/wscons/wsdisplay_vcons.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/wscons/wsdisplay_vcons.c
diff -u src/sys/dev/wscons/wsdisplay_vcons.c:1.32 src/sys/dev/wscons/wsdisplay_vcons.c:1.32.4.1
--- src/sys/dev/wscons/wsdisplay_vcons.c:1.32 Tue Mar 18 18:20:42 2014
+++ src/sys/dev/wscons/wsdisplay_vcons.c Tue Nov 11 12:50:48 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: wsdisplay_vcons.c,v 1.32 2014/03/18 18:20:42 riastradh Exp $ */
+/* $NetBSD: wsdisplay_vcons.c,v 1.32.4.1 2014/11/11 12:50:48 martin Exp $ */
/*-
* Copyright (c) 2005, 2006 Michael Lorenz
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: wsdisplay_vcons.c,v 1.32 2014/03/18 18:20:42 riastradh Exp $");
+__KERNEL_RCSID(0, "$NetBSD: wsdisplay_vcons.c,v 1.32.4.1 2014/11/11 12:50:48 martin Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -314,8 +314,10 @@ vcons_init_screen(struct vcons_data *vd,
if (vd->chars != NULL) free(vd->chars, M_DEVBUF);
if (vd->attrs != NULL) free(vd->attrs, M_DEVBUF);
vd->cells = size;
- vd->chars = malloc(size * sizeof(uint32_t), M_DEVBUF, M_WAITOK);
- vd->attrs = malloc(size * sizeof(long), M_DEVBUF, M_WAITOK);
+ vd->chars = malloc(size * sizeof(uint32_t), M_DEVBUF,
+ M_WAITOK|M_ZERO);
+ vd->attrs = malloc(size * sizeof(long), M_DEVBUF,
+ M_WAITOK|M_ZERO);
vcons_invalidate_cache(vd);
}
#endif
