upstream/opnsense-src
1
0
Fork 0
mirror of https://github.com/opnsense/src.git synced 2026-05-28 04:12:45 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

cam: Remove Giant handling from cam_sim_alloc()

Browse source 
There are no non-MPSAFE SIM drivers left in the tree, verified with
coccinelle.

Reviewed by:	scottl, imp
Differential Revision:	https://reviews.freebsd.org/D27853
This commit is contained in:
Mark Johnston 2021-01-03 11:34:10 -05:00
parent 90f580b954
commit 2ce5eef6e2
2 changed files with 2 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sys/cam/cam_sim.c
View file

@ -72,9 +72,7 @@ cam_sim_alloc(sim_action_func sim_action, sim_poll_func sim_poll,
{
struct cam_sim *sim;
sim = (struct cam_sim *)malloc(sizeof(struct cam_sim),
M_CAMSIM, M_ZERO | M_NOWAIT);
sim = malloc(sizeof(struct cam_sim), M_CAMSIM, M_ZERO | M_NOWAIT);
if (sim == NULL)
return (NULL);
@ -92,13 +90,7 @@ cam_sim_alloc(sim_action_func sim_action, sim_poll_func sim_poll,
sim->refcount = 1;
sim->devq = queue;
sim->mtx = mtx;
if (mtx == &Giant) {
sim->flags |= 0;
callout_init(&sim->callout, 0);
} else {
sim->flags |= CAM_SIM_MPSAFE;
callout_init(&sim->callout, 1);
}
callout_init(&sim->callout, 1);
return (sim);
}

1
sys/cam/cam_sim.h
View file

@ -103,7 +103,6 @@ struct cam_sim {
int max_dev_openings;
u_int32_t flags;
#define CAM_SIM_REL_TIMEOUT_PENDING 0x01
#define CAM_SIM_MPSAFE 0x02
struct callout callout;
struct cam_devq *devq; /* Device Queue to use for this SIM */
int refcount; /* References to the SIM. */