Page MenuHomeFreeBSD
Files F106140133

D15747.diff
No OneTemporary
Actions

D15747.diff
View Options

Index: head/sys/dev/ocs_fc/ocs_ioctl.c
===================================================================
--- head/sys/dev/ocs_fc/ocs_ioctl.c
+++ head/sys/dev/ocs_fc/ocs_ioctl.c
@@ -140,7 +140,7 @@
wrobj->host_buffer_descriptor[0].u.data.buffer_address_high = ocs_addr32_hi(dma->phys);
/* copy the data into the DMA buffer */
- copyin((void *)mcmd->in_addr, dma->virt, mcmd->in_bytes);
+ copyin((void *)(uintptr_t)mcmd->in_addr, dma->virt, mcmd->in_bytes);
}
break;
case SLI4_OPC_COMMON_DELETE_OBJECT:
@@ -169,8 +169,8 @@
break;
default:
device_printf(ocs->dev, "%s: in=%p (%lld) out=%p (%lld)\n", __func__,
- (void *)mcmd->in_addr, (unsigned long long)mcmd->in_bytes,
- (void *)mcmd->out_addr, (unsigned long long)mcmd->out_bytes);
+ (void *)(uintptr_t)mcmd->in_addr, (unsigned long long)mcmd->in_bytes,
+ (void *)(uintptr_t)mcmd->out_addr, (unsigned long long)mcmd->out_bytes);
device_printf(ocs->dev, "%s: unknown (opc=%#x)\n", __func__,
req->opcode);
hexdump(mcmd, mcmd->size, NULL, 0);
@@ -184,7 +184,7 @@
return ENXIO;
}
- copyin((void *)mcmd->in_addr, dma->virt, mcmd->in_bytes);
+ copyin((void *)(uintptr_t)mcmd->in_addr, dma->virt, mcmd->in_bytes);
sli_config->payload.mem.address_low = ocs_addr32_lo(dma->phys);
sli_config->payload.mem.address_high = ocs_addr32_hi(dma->phys);
@@ -250,7 +250,7 @@
if( SLI4_MBOX_COMMAND_SLI_CONFIG == ((sli4_mbox_command_header_t *)mcmd->payload)->command
&& mcmd->out_bytes && dma.virt) {
- copyout(dma.virt, (void *)mcmd->out_addr, mcmd->out_bytes);
+ copyout(dma.virt, (void *)(uintptr_t)mcmd->out_addr, mcmd->out_bytes);
}
no_support:
Index: head/sys/dev/ocs_fc/ocs_sport.c
===================================================================
--- head/sys/dev/ocs_fc/ocs_sport.c
+++ head/sys/dev/ocs_fc/ocs_sport.c
@@ -781,7 +781,7 @@
case OCS_EVT_ENTER: {
ocs_node_t *node;
- ocs_log_debug(ocs, "[%s] SPORT attached WWPN %016llx WWNN %016llx \n", (unsigned long long)sport->display_name,
+ ocs_log_debug(ocs, "[%s] SPORT attached WWPN %016llx WWNN %016llx \n", sport->display_name,
sport->wwpn, sport->wwnn);
ocs_sport_lock(sport);
ocs_list_foreach(&sport->node_list, node) {
@@ -805,7 +805,7 @@
}
case OCS_EVT_EXIT:
- ocs_log_debug(ocs, "[%s] SPORT deattached WWPN %016llx WWNN %016llx \n", (unsigned long long)sport->display_name,
+ ocs_log_debug(ocs, "[%s] SPORT deattached WWPN %016llx WWNN %016llx \n", sport->display_name,
sport->wwpn, sport->wwnn);
if (sport->enable_ini) {
ocs_scsi_ini_del_sport(sport);

File Metadata

Mime Type
text/plain
Expires
Fri, Dec 27, 1:41 AM (12 h, 19 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
15609947
Default Alt Text
D15747.diff (2 KB)

Event Timeline