@@ -309,11 +309,12 @@
  * - create minor device nodes for the device instance (for MegaRAID,
  *   controller instance)
  * - report that the device instance (for MegaRAID, controller instance) has
  *   attached
  */
-#if       __SunOS_5_11
+/* #if       __SunOS_5_11 */
+#if 0
 #define   DDI_PM_RESUME DDI_PM_RESUME_OBSOLETE
 #define   DDI_PM_SUSPEND DDI_PM_SUSPEND_OBSOLETE
 #endif // __SunOS_5_11
 static int
 mrsas_attach(dev_info_t *dip, ddi_attach_cmd_t cmd)

@@ -2645,11 +2646,11 @@
                         con_log(CL_ANN1, (CE_CONT, "CDB[%d]=0x%x ",i,
                                 ddi_get8(instance->mpi2_frame_pool_dma_obj.acc_handle, &scsi_io->CDB.CDB32[i]) ));
 
                 con_log(CL_ANN1, (CE_CONT, "RAID-CONTEXT\n"));
                 con_log(CL_ANN1, (CE_CONT, "status=0x%X extStatus=0x%X ldTargetId=0x%X timeoutValue=0x%X"
-                        "regLockFlags=0x%X RAIDFlags=0x%X regLockRowLBA=0x%lX regLockLength=0x%X spanArm=0x%X\n",
+                        "regLockFlags=0x%X RAIDFlags=0x%X regLockRowLBA=0x%" PRIx64 " regLockLength=0x%X spanArm=0x%X\n",
                         ddi_get8(instance->mpi2_frame_pool_dma_obj.acc_handle, &scsi_io->RaidContext.status),
                         ddi_get8(instance->mpi2_frame_pool_dma_obj.acc_handle, &scsi_io->RaidContext.extStatus),
                         ddi_get16(instance->mpi2_frame_pool_dma_obj.acc_handle, &scsi_io->RaidContext.ldTargetId),
                         ddi_get16(instance->mpi2_frame_pool_dma_obj.acc_handle, &scsi_io->RaidContext.timeoutValue),
                         ddi_get8(instance->mpi2_frame_pool_dma_obj.acc_handle, &scsi_io->RaidContext.regLockFlags),