Page MenuHomeFreeBSD
Files F160441272

D14344.id39261.diff
No OneTemporary
Actions

D14344.id39261.diff
View Options

Index: head/sys/dev/mpr/mpr.c
===================================================================
--- head/sys/dev/mpr/mpr.c
+++ head/sys/dev/mpr/mpr.c
@@ -1356,10 +1356,10 @@
sc->free_busaddr = queues_busaddr;
sc->post_queue = (MPI2_REPLY_DESCRIPTORS_UNION *)(queues + fqsize);
sc->post_busaddr = queues_busaddr + fqsize;
- mpr_dprint(sc, MPR_INIT, "free queue busaddr= %#016lx size= %d\n",
- sc->free_busaddr, fqsize);
- mpr_dprint(sc, MPR_INIT, "reply queue busaddr= %#016lx size= %d\n",
- sc->post_busaddr, pqsize);
+ mpr_dprint(sc, MPR_INIT, "free queue busaddr= %#016jx size= %d\n",
+ (uintmax_t)sc->free_busaddr, fqsize);
+ mpr_dprint(sc, MPR_INIT, "reply queue busaddr= %#016jx size= %d\n",
+ (uintmax_t)sc->post_busaddr, pqsize);
return (0);
}
@@ -1402,8 +1402,8 @@
bzero(sc->reply_frames, rsize);
bus_dmamap_load(sc->reply_dmat, sc->reply_map, sc->reply_frames, rsize,
mpr_memaddr_cb, &sc->reply_busaddr, 0);
- mpr_dprint(sc, MPR_INIT, "reply frames busaddr= %#016lx size= %d\n",
- sc->reply_busaddr, rsize);
+ mpr_dprint(sc, MPR_INIT, "reply frames busaddr= %#016jx size= %d\n",
+ (uintmax_t)sc->reply_busaddr, rsize);
return (0);
}
@@ -1438,8 +1438,8 @@
bzero(sc->req_frames, rsize);
bus_dmamap_load(sc->req_dmat, sc->req_map, sc->req_frames, rsize,
mpr_memaddr_cb, &sc->req_busaddr, 0);
- mpr_dprint(sc, MPR_INIT, "request frames busaddr= %#016lx size= %d\n",
- sc->req_busaddr, rsize);
+ mpr_dprint(sc, MPR_INIT, "request frames busaddr= %#016jx size= %d\n",
+ (uintmax_t)sc->req_busaddr, rsize);
rsize = sc->chain_frame_size * sc->num_chains;
if (bus_dma_tag_create( sc->mpr_parent_dmat, /* parent */
@@ -1464,8 +1464,8 @@
bzero(sc->chain_frames, rsize);
bus_dmamap_load(sc->chain_dmat, sc->chain_map, sc->chain_frames, rsize,
mpr_memaddr_cb, &sc->chain_busaddr, 0);
- mpr_dprint(sc, MPR_INIT, "chain frames busaddr= %#016lx size= %d\n",
- sc->chain_busaddr, rsize);
+ mpr_dprint(sc, MPR_INIT, "chain frames busaddr= %#016jx size= %d\n",
+ (uintmax_t)sc->chain_busaddr, rsize);
rsize = MPR_SENSE_LEN * sc->num_reqs;
if (bus_dma_tag_create( sc->mpr_parent_dmat, /* parent */
@@ -1490,8 +1490,8 @@
bzero(sc->sense_frames, rsize);
bus_dmamap_load(sc->sense_dmat, sc->sense_map, sc->sense_frames, rsize,
mpr_memaddr_cb, &sc->sense_busaddr, 0);
- mpr_dprint(sc, MPR_INIT, "sense frames busaddr= %#016lx size= %d\n",
- sc->sense_busaddr, rsize);
+ mpr_dprint(sc, MPR_INIT, "sense frames busaddr= %#016jx size= %d\n",
+ (uintmax_t)sc->sense_busaddr, rsize);
sc->chains = malloc(sizeof(struct mpr_chain) * sc->num_chains, M_MPR,
M_WAITOK | M_ZERO);
Index: head/sys/dev/mps/mps.c
===================================================================
--- head/sys/dev/mps/mps.c
+++ head/sys/dev/mps/mps.c
@@ -1313,10 +1313,10 @@
sc->free_busaddr = queues_busaddr;
sc->post_queue = (MPI2_REPLY_DESCRIPTORS_UNION *)(queues + fqsize);
sc->post_busaddr = queues_busaddr + fqsize;
- mps_dprint(sc, MPS_INIT, "free queue busaddr= %#016lx size= %d\n",
- sc->free_busaddr, fqsize);
- mps_dprint(sc, MPS_INIT, "reply queue busaddr= %#016lx size= %d\n",
- sc->post_busaddr, pqsize);
+ mps_dprint(sc, MPS_INIT, "free queue busaddr= %#016jx size= %d\n",
+ (uintmax_t)sc->free_busaddr, fqsize);
+ mps_dprint(sc, MPS_INIT, "reply queue busaddr= %#016jx size= %d\n",
+ (uintmax_t)sc->post_busaddr, pqsize);
return (0);
}
@@ -1360,8 +1360,8 @@
bus_dmamap_load(sc->reply_dmat, sc->reply_map, sc->reply_frames, rsize,
mps_memaddr_cb, &sc->reply_busaddr, 0);
- mps_dprint(sc, MPS_INIT, "reply frames busaddr= %#016lx size= %d\n",
- sc->reply_busaddr, rsize);
+ mps_dprint(sc, MPS_INIT, "reply frames busaddr= %#016jx size= %d\n",
+ (uintmax_t)sc->reply_busaddr, rsize);
return (0);
}
@@ -1396,8 +1396,8 @@
bzero(sc->req_frames, rsize);
bus_dmamap_load(sc->req_dmat, sc->req_map, sc->req_frames, rsize,
mps_memaddr_cb, &sc->req_busaddr, 0);
- mps_dprint(sc, MPS_INIT, "request frames busaddr= %#016lx size= %d\n",
- sc->req_busaddr, rsize);
+ mps_dprint(sc, MPS_INIT, "request frames busaddr= %#016jx size= %d\n",
+ (uintmax_t)sc->req_busaddr, rsize);
rsize = sc->reqframesz * sc->num_chains;
if (bus_dma_tag_create( sc->mps_parent_dmat, /* parent */
@@ -1422,8 +1422,8 @@
bzero(sc->chain_frames, rsize);
bus_dmamap_load(sc->chain_dmat, sc->chain_map, sc->chain_frames, rsize,
mps_memaddr_cb, &sc->chain_busaddr, 0);
- mps_dprint(sc, MPS_INIT, "chain frames busaddr= %#016lx size= %d\n",
- sc->chain_busaddr, rsize);
+ mps_dprint(sc, MPS_INIT, "chain frames busaddr= %#016jx size= %d\n",
+ (uintmax_t)sc->chain_busaddr, rsize);
rsize = MPS_SENSE_LEN * sc->num_reqs;
if (bus_dma_tag_create( sc->mps_parent_dmat, /* parent */
@@ -1448,8 +1448,8 @@
bzero(sc->sense_frames, rsize);
bus_dmamap_load(sc->sense_dmat, sc->sense_map, sc->sense_frames, rsize,
mps_memaddr_cb, &sc->sense_busaddr, 0);
- mps_dprint(sc, MPS_INIT, "sense frames busaddr= %#016lx size= %d\n",
- sc->sense_busaddr, rsize);
+ mps_dprint(sc, MPS_INIT, "sense frames busaddr= %#016jx size= %d\n",
+ (uintmax_t)sc->sense_busaddr, rsize);
sc->chains = malloc(sizeof(struct mps_chain) * sc->num_chains, M_MPT2,
M_WAITOK | M_ZERO);

File Metadata

Mime Type
text/plain
Expires
Thu, Jun 25, 11:23 AM (21 h, 14 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
34321396
Default Alt Text
D14344.id39261.diff (5 KB)

Event Timeline