summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>2008-10-29 01:14:48 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>2008-10-29 01:14:48 +0000
commit4d6c82286aaa3a5ff77535a51637f36a6692ae36 (patch)
treeaa96c72372c479d55c51a397e00fd3a6ca948fcb
parent4c30f8cd469374e124acd77154fe0911da7856a7 (diff)
dlg says "well, that is embarassing"
-rw-r--r--sys/dev/pci/if_nxe.c6
-rw-r--r--sys/dev/pci/if_vic.c6
2 files changed, 6 insertions, 6 deletions
diff --git a/sys/dev/pci/if_nxe.c b/sys/dev/pci/if_nxe.c
index 788a17e88d4..81d6706ec5e 100644
--- a/sys/dev/pci/if_nxe.c
+++ b/sys/dev/pci/if_nxe.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_nxe.c,v 1.56 2008/10/02 20:21:14 brad Exp $ */
+/* $OpenBSD: if_nxe.c,v 1.57 2008/10/29 01:14:47 deraadt Exp $ */
/*
* Copyright (c) 2007 David Gwynne <dlg@openbsd.org>
@@ -1624,7 +1624,7 @@ nxe_board_info(struct nxe_softc *sc)
int rv = 1;
int i;
- ni = malloc(sizeof(struct nxe_info), M_NOWAIT, M_TEMP);
+ ni = malloc(sizeof(struct nxe_info), M_TEMP, M_NOWAIT);
if (ni == NULL) {
printf(": unable to allocate temporary memory\n");
return (1);
@@ -1671,7 +1671,7 @@ nxe_user_info(struct nxe_softc *sc)
struct nxe_lladdr *la;
int rv = 1;
- nu = malloc(sizeof(struct nxe_userinfo), M_NOWAIT, M_TEMP);
+ nu = malloc(sizeof(struct nxe_userinfo), M_TEMP, M_NOWAIT);
if (nu == NULL) {
printf(": unable to allocate temp memory\n");
return (1);
diff --git a/sys/dev/pci/if_vic.c b/sys/dev/pci/if_vic.c
index 7c52bbbd4a1..fa86222cfa6 100644
--- a/sys/dev/pci/if_vic.c
+++ b/sys/dev/pci/if_vic.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: if_vic.c,v 1.55 2008/10/02 20:21:14 brad Exp $ */
+/* $OpenBSD: if_vic.c,v 1.56 2008/10/29 01:14:47 deraadt Exp $ */
/*
* Copyright (c) 2006 Reyk Floeter <reyk@openbsd.org>
@@ -561,14 +561,14 @@ vic_alloc_data(struct vic_softc *sc)
int i;
sc->sc_rxbuf = malloc(sizeof(struct vic_rxbuf) * sc->sc_nrxbuf,
- M_NOWAIT, M_DEVBUF);
+ M_DEVBUF, M_NOWAIT);
if (sc->sc_rxbuf == NULL) {
printf(": unable to allocate rxbuf\n");
goto err;
}
sc->sc_txbuf = malloc(sizeof(struct vic_txbuf) * sc->sc_ntxbuf,
- M_NOWAIT, M_DEVBUF);
+ M_DEVBUF, M_NOWAIT);
if (sc->sc_txbuf == NULL) {
printf(": unable to allocate txbuf\n");
goto freerx;