diff options
author | alfred <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
---|---|---|
committer | alfred <alfred@FreeBSD.org> | 2003-01-21 08:56:16 +0000 |
commit | bf8e8a6e8f0bd9165109f0a258730dd242299815 (patch) | |
tree | f16a2fb9fa7a7fbc4c19e981d278d5f6eb53234d /sys/sparc64/pci | |
parent | 2180deee00350fff613a1d1d1328eddc4c0ba9c8 (diff) | |
download | FreeBSD-src-bf8e8a6e8f0bd9165109f0a258730dd242299815.zip FreeBSD-src-bf8e8a6e8f0bd9165109f0a258730dd242299815.tar.gz |
Remove M_TRYWAIT/M_WAITOK/M_WAIT. Callers should use 0.
Merge M_NOWAIT/M_DONTWAIT into a single flag M_NOWAIT.
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 3787a00..3875a29 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, M_WAITOK); + *rintr = malloc(sizeof(intr), M_OFWPROP, 0); 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_WAITOK | M_ZERO); + M_DEVBUF, 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 30205c8..9b32b95 100644 --- a/sys/sparc64/pci/psycho.c +++ b/sys/sparc64/pci/psycho.c @@ -611,7 +611,7 @@ psycho_attach(device_t dev) */ if (INTVEC(mr) != 0x7e6 && INTVEC(mr) != 0x7e7 && INTVEC(mr) != 0) { - sclr = malloc(sizeof(*sclr), M_DEVBUF, M_WAITOK); + sclr = malloc(sizeof(*sclr), M_DEVBUF, 0); sclr->psc_sc = sc; sclr->psc_clr = clr; intr_setup(PIL_LOW, intr_fast, INTVEC(mr), |