diff options
author | gjb <gjb@FreeBSD.org> | 2013-09-25 01:48:45 +0000 |
---|---|---|
committer | gjb <gjb@FreeBSD.org> | 2013-09-25 01:48:45 +0000 |
commit | d965f28ba1171a60f27bd8b0e21de9412e2640f2 (patch) | |
tree | 4ba80487d8d5ba6364f0f8d1bdf5ad85102180c3 /sys/dev/hptnr | |
parent | 85074aa18eb69e2ea599def9d5b8a5bbb5addf8b (diff) | |
download | FreeBSD-src-d965f28ba1171a60f27bd8b0e21de9412e2640f2.zip FreeBSD-src-d965f28ba1171a60f27bd8b0e21de9412e2640f2.tar.gz |
Revert r255853 pending fixes to build errors in usr.bin/kdump
Approved by: re (implicit)
Diffstat (limited to 'sys/dev/hptnr')
-rw-r--r-- | sys/dev/hptnr/hptnr_osm_bsd.c | 5 | ||||
-rw-r--r-- | sys/dev/hptnr/os_bsd.h | 1 |
2 files changed, 2 insertions, 4 deletions
diff --git a/sys/dev/hptnr/hptnr_osm_bsd.c b/sys/dev/hptnr/hptnr_osm_bsd.c index 87441be..7021abe 100644 --- a/sys/dev/hptnr/hptnr_osm_bsd.c +++ b/sys/dev/hptnr/hptnr_osm_bsd.c @@ -432,7 +432,7 @@ static void os_cmddone(PCOMMAND pCmd) KdPrint(("os_cmddone(%p, %d)", pCmd, pCmd->Result)); - untimeout(hpt_timeout, pCmd, ext->timeout_ch); + untimeout(hpt_timeout, pCmd, ccb->ccb_h.timeout_ch); switch(pCmd->Result) { case RETURN_SUCCESS: @@ -511,7 +511,7 @@ static void hpt_io_dmamap_callback(void *arg, bus_dma_segment_t *segs, int nsegs } } - ext->timeout_ch = timeout(hpt_timeout, pCmd, HPT_OSM_TIMEOUT); + ext->ccb->ccb_h.timeout_ch = timeout(hpt_timeout, pCmd, HPT_OSM_TIMEOUT); ldm_queue_cmd(pCmd); } @@ -1048,7 +1048,6 @@ static void hpt_final_init(void *dummy) os_printk("Can't create dma map(%d)", i); return ; } - callout_handle_init(&ext->timeout_ch); } if ((devq = cam_simq_alloc(os_max_queue_comm)) == NULL) { diff --git a/sys/dev/hptnr/os_bsd.h b/sys/dev/hptnr/os_bsd.h index 8fda267..bdf9be7 100644 --- a/sys/dev/hptnr/os_bsd.h +++ b/sys/dev/hptnr/os_bsd.h @@ -176,7 +176,6 @@ typedef struct _os_cmdext { struct _os_cmdext *next; union ccb *ccb; bus_dmamap_t dma_map; - struct callout_handle timeout_ch; SG psg[os_max_sg_descriptors]; } OS_CMDEXT, *POS_CMDEXT; |