diff options
| author | imp <imp@FreeBSD.org> | 2003-02-19 05:47:46 +0000 |
|---|---|---|
| committer | imp <imp@FreeBSD.org> | 2003-02-19 05:47:46 +0000 |
| commit | cf874b345d0f766fb64cf4737e1c85ccc78d2bee (patch) | |
| tree | 9e20e320fe15ae4bf68f8335fcf9d3e71d3b3614 /sys/sparc64/pci | |
| parent | b72619cecb8265d3efb3781b0acff1380762c173 (diff) | |
| download | FreeBSD-src-cf874b345d0f766fb64cf4737e1c85ccc78d2bee.zip FreeBSD-src-cf874b345d0f766fb64cf4737e1c85ccc78d2bee.tar.gz | |
Back out M_* changes, per decision of the TRB.
Approved by: trb
Diffstat (limited to 'sys/sparc64/pci')
| -rw-r--r-- | sys/sparc64/pci/ofw_pci.c | 4 | ||||
| -rw-r--r-- | sys/sparc64/pci/psycho.c | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sys/sparc64/pci/ofw_pci.c b/sys/sparc64/pci/ofw_pci.c index 3875a29..3787a00 100644 --- a/sys/sparc64/pci/ofw_pci.c +++ b/sys/sparc64/pci/ofw_pci.c @@ -94,7 +94,7 @@ ofw_pci_orb_callback(phandle_t node, u_int8_t *pintptr, int pintsz, bcopy(pregptr, &preg, sizeof(preg)); intr = (OFW_PCI_PHYS_HI_DEVICE(preg.phys_hi) + pintr + 3) % 4 + 1; - *rintr = malloc(sizeof(intr), M_OFWPROP, 0); + *rintr = malloc(sizeof(intr), M_OFWPROP, M_WAITOK); bcopy(&intr, *rintr, sizeof(intr)); *terminate = 0; return (sizeof(intr)); @@ -134,7 +134,7 @@ ofw_pci_alloc_busno(phandle_t node) om = pci_bus_map; pci_bus_map_sz = n + PCI_BUS_MAP_INC; pci_bus_map = malloc(sizeof(*pci_bus_map) * pci_bus_map_sz, - M_DEVBUF, M_ZERO); + M_DEVBUF, M_WAITOK | M_ZERO); if (om != NULL) { bcopy(om, pci_bus_map, sizeof(*om) * osz); free(om, M_DEVBUF); diff --git a/sys/sparc64/pci/psycho.c b/sys/sparc64/pci/psycho.c index 6413fd3..9fd83e2 100644 --- a/sys/sparc64/pci/psycho.c +++ b/sys/sparc64/pci/psycho.c @@ -617,7 +617,7 @@ psycho_attach(device_t dev) */ if (INTVEC(mr) != 0x7e6 && INTVEC(mr) != 0x7e7 && INTVEC(mr) != 0) { - sclr = malloc(sizeof(*sclr), M_DEVBUF, 0); + sclr = malloc(sizeof(*sclr), M_DEVBUF, M_WAITOK); sclr->psc_sc = sc; sclr->psc_clr = clr; intr_setup(PIL_LOW, intr_fast, INTVEC(mr), |
