Module Name: src
Committed By: matt
Date: Sat Jun 22 05:41:25 UTC 2013
Modified Files:
src/sys/arch/i386/pnpbios: pciide_pnpbios.c
src/sys/dev/ic: ahcisata_core.c siisata.c
Log Message:
Make sure dynamically allocated channel_queue struct are zero-filled.
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/sys/arch/i386/pnpbios/pciide_pnpbios.c
cvs rdiff -u -r1.47 -r1.48 src/sys/dev/ic/ahcisata_core.c
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/ic/siisata.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/arch/i386/pnpbios/pciide_pnpbios.c
diff -u src/sys/arch/i386/pnpbios/pciide_pnpbios.c:1.30 src/sys/arch/i386/pnpbios/pciide_pnpbios.c:1.31
--- src/sys/arch/i386/pnpbios/pciide_pnpbios.c:1.30 Tue Jul 31 15:50:32 2012
+++ src/sys/arch/i386/pnpbios/pciide_pnpbios.c Sat Jun 22 05:41:25 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: pciide_pnpbios.c,v 1.30 2012/07/31 15:50:32 bouyer Exp $ */
+/* $NetBSD: pciide_pnpbios.c,v 1.31 2013/06/22 05:41:25 matt Exp $ */
/*
* Copyright (c) 1999 Soren S. Jorvang. All rights reserved.
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: pciide_pnpbios.c,v 1.30 2012/07/31 15:50:32 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: pciide_pnpbios.c,v 1.31 2013/06/22 05:41:25 matt Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -119,7 +119,7 @@ pciide_pnpbios_attach(device_t parent, d
cp->ata_channel.ch_channel = 0;
cp->ata_channel.ch_atac = &sc->sc_wdcdev.sc_atac;
cp->ata_channel.ch_queue = malloc(sizeof(struct ata_queue),
- M_DEVBUF, M_NOWAIT);
+ M_DEVBUF, M_NOWAIT|M_ZERO);
if (cp->ata_channel.ch_queue == NULL) {
aprint_error_dev(self, "unable to allocate memory for command "
"queue\n");
Index: src/sys/dev/ic/ahcisata_core.c
diff -u src/sys/dev/ic/ahcisata_core.c:1.47 src/sys/dev/ic/ahcisata_core.c:1.48
--- src/sys/dev/ic/ahcisata_core.c:1.47 Wed Apr 3 17:15:07 2013
+++ src/sys/dev/ic/ahcisata_core.c Sat Jun 22 05:41:25 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: ahcisata_core.c,v 1.47 2013/04/03 17:15:07 bouyer Exp $ */
+/* $NetBSD: ahcisata_core.c,v 1.48 2013/06/22 05:41:25 matt Exp $ */
/*
* Copyright (c) 2006 Manuel Bouyer.
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ahcisata_core.c,v 1.47 2013/04/03 17:15:07 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ahcisata_core.c,v 1.48 2013/06/22 05:41:25 matt Exp $");
#include <sys/types.h>
#include <sys/malloc.h>
@@ -326,7 +326,7 @@ ahci_attach(struct ahci_softc *sc)
chp->ch_channel = i;
chp->ch_atac = &sc->sc_atac;
chp->ch_queue = malloc(sizeof(struct ata_queue),
- M_DEVBUF, M_NOWAIT);
+ M_DEVBUF, M_NOWAIT|M_ZERO);
if (chp->ch_queue == NULL) {
aprint_error("%s port %d: can't allocate memory for "
"command queue", AHCINAME(sc), i);
Index: src/sys/dev/ic/siisata.c
diff -u src/sys/dev/ic/siisata.c:1.25 src/sys/dev/ic/siisata.c:1.26
--- src/sys/dev/ic/siisata.c:1.25 Sun Jun 9 09:44:51 2013
+++ src/sys/dev/ic/siisata.c Sat Jun 22 05:41:25 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: siisata.c,v 1.25 2013/06/09 09:44:51 njoly Exp $ */
+/* $NetBSD: siisata.c,v 1.26 2013/06/22 05:41:25 matt Exp $ */
/* from ahcisata_core.c */
@@ -79,7 +79,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: siisata.c,v 1.25 2013/06/09 09:44:51 njoly Exp $");
+__KERNEL_RCSID(0, "$NetBSD: siisata.c,v 1.26 2013/06/22 05:41:25 matt Exp $");
#include <sys/types.h>
#include <sys/malloc.h>
@@ -291,7 +291,7 @@ siisata_attach_port(struct siisata_softc
chp->ch_channel = port;
chp->ch_atac = &sc->sc_atac;
chp->ch_queue = malloc(sizeof(struct ata_queue),
- M_DEVBUF, M_NOWAIT);
+ M_DEVBUF, M_NOWAIT|M_ZERO);
if (chp->ch_queue == NULL) {
aprint_error_dev(sc->sc_atac.atac_dev,
"port %d: can't allocate memory "
