31c31
< __FBSDID("$FreeBSD: head/sys/cam/cam_xpt.c 147571 2005-06-24 08:09:05Z avatar $");
---
> __FBSDID("$FreeBSD: head/sys/cam/cam_xpt.c 147723 2005-07-01 15:21:30Z avatar $");
67a68
> MALLOC_DEFINE(M_CAMXPT, "CAM XPT", "CAM XPT buffers");
3404c3405
< free(cur_entry, M_DEVBUF);
---
> free(cur_entry, M_CAMXPT);
3409c3410
< cur_entry = malloc(sizeof(*cur_entry), M_DEVBUF,
---
> cur_entry = malloc(sizeof(*cur_entry), M_CAMXPT,
4018c4019
< path = (struct cam_path *)malloc(sizeof(*path), M_DEVBUF, M_NOWAIT);
---
> path = (struct cam_path *)malloc(sizeof(*path), M_CAMXPT, M_NOWAIT);
4026c4027
< free(path, M_DEVBUF);
---
> free(path, M_CAMXPT);
4132c4133
< free(path, M_DEVBUF);
---
> free(path, M_CAMXPT);
4358c4359
< M_DEVBUF, M_NOWAIT);
---
> M_CAMXPT, M_NOWAIT);
4872c4873
< new_ccb = malloc(sizeof(*new_ccb), M_DEVBUF, M_WAITOK);
---
> new_ccb = malloc(sizeof(*new_ccb), M_CAMXPT, M_WAITOK);
4875a4877,4887
> union ccb *
> xpt_alloc_ccb_nowait()
> {
> union ccb *new_ccb;
>
> GIANT_REQUIRED;
>
> new_ccb = malloc(sizeof(*new_ccb), M_CAMXPT, M_NOWAIT);
> return (new_ccb);
> }
>
4879c4891
< free(free_ccb, M_DEVBUF);
---
> free(free_ccb, M_CAMXPT);
4901c4913
< new_ccb = malloc(sizeof(*new_ccb), M_DEVBUF, M_NOWAIT);
---
> new_ccb = xpt_alloc_ccb_nowait();
4928c4940
< free(bus, M_DEVBUF);
---
> free(bus, M_CAMXPT);
4938c4950
< target = (struct cam_et *)malloc(sizeof(*target), M_DEVBUF, M_NOWAIT);
---
> target = (struct cam_et *)malloc(sizeof(*target), M_CAMXPT, M_NOWAIT);
4980c4992
< free(target, M_DEVBUF);
---
> free(target, M_CAMXPT);
5004c5016
< M_DEVBUF, M_NOWAIT);
---
> M_CAMXPT, M_NOWAIT);
5018c5030
< free(device, M_DEVBUF);
---
> free(device, M_CAMXPT);
5024c5036
< free(device, M_DEVBUF);
---
> free(device, M_CAMXPT);
5112c5124
< free(device, M_DEVBUF);
---
> free(device, M_CAMXPT);
5960c5972
< free(path->device->serial_num, M_DEVBUF);
---
> free(path->device->serial_num, M_CAMXPT);
5975c5987
< M_DEVBUF, M_NOWAIT);
---
> M_CAMXPT, M_NOWAIT);