From 44956c9863dc03344b03bdf6a83acf4e743f8e50 Mon Sep 17 00:00:00 2001 From: Alfred Perlstein Date: Tue, 21 Jan 2003 08:56:16 +0000 Subject: Remove M_TRYWAIT/M_WAITOK/M_WAIT. Callers should use 0. Merge M_NOWAIT/M_DONTWAIT into a single flag M_NOWAIT. --- sys/dev/pci/pci.c | 2 +- sys/dev/pci/pci_user.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'sys/dev/pci') diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index 2c5e7a4f9ef3..ecdcba0a231a 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -333,7 +333,7 @@ pci_read_device(device_t pcib, int b, int s, int f, size_t size) devlist_entry = NULL; if (PCIB_READ_CONFIG(pcib, b, s, f, PCIR_DEVVENDOR, 4) != -1) { - devlist_entry = malloc(size, M_DEVBUF, M_WAITOK | M_ZERO); + devlist_entry = malloc(size, M_DEVBUF, M_ZERO); if (devlist_entry == NULL) return (NULL); diff --git a/sys/dev/pci/pci_user.c b/sys/dev/pci/pci_user.c index 83b63b3ed692..d39b026e2ae1 100644 --- a/sys/dev/pci/pci_user.c +++ b/sys/dev/pci/pci_user.c @@ -307,7 +307,7 @@ pci_ioctl(dev_t dev, u_long cmd, caddr_t data, int flag, struct thread *td) * Allocate a buffer to hold the patterns. */ pattern_buf = malloc(cio->pat_buf_len, M_TEMP, - M_WAITOK); + 0); error = copyin(cio->patterns, pattern_buf, cio->pat_buf_len); if (error != 0) -- cgit v1.3