summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormav <mav@FreeBSD.org>2017-03-29 19:25:42 +0000
committermav <mav@FreeBSD.org>2017-03-29 19:25:42 +0000
commit76baeb805826c6bfd3534d413018138663687a31 (patch)
treed3690bb07a2689505fde3d6a1a6ab9d270897465
parent26135bdc52cd30bc128def9f467ea4fba802a01f (diff)
downloadFreeBSD-src-76baeb805826c6bfd3534d413018138663687a31.zip
FreeBSD-src-76baeb805826c6bfd3534d413018138663687a31.tar.gz
Fix build broken by different size of lun_id_t.
-rw-r--r--sys/dev/isp/isp_freebsd.c2
-rw-r--r--sys/dev/isp/isp_target.c8
2 files changed, 5 insertions, 5 deletions
diff --git a/sys/dev/isp/isp_freebsd.c b/sys/dev/isp/isp_freebsd.c
index 553e4de..4a9111c 100644
--- a/sys/dev/isp/isp_freebsd.c
+++ b/sys/dev/isp/isp_freebsd.c
@@ -2369,7 +2369,7 @@ isp_handle_platform_target_tmf(ispsoftc_t *isp, isp_notify_t *notify)
atio_private_data_t *atp;
lun_id_t lun;
- isp_prt(isp, ISP_LOGTDEBUG0, "%s: code 0x%x sid 0x%x tagval 0x%016llx chan %d lun %jx", __func__, notify->nt_ncode,
+ isp_prt(isp, ISP_LOGTDEBUG0, "%s: code 0x%x sid 0x%x tagval 0x%016llx chan %d lun %x", __func__, notify->nt_ncode,
notify->nt_sid, (unsigned long long) notify->nt_tagval, notify->nt_channel, notify->nt_lun);
if (notify->nt_lun == LUN_ANY) {
if (notify->nt_tagval == TAG_ANY) {
diff --git a/sys/dev/isp/isp_target.c b/sys/dev/isp/isp_target.c
index f7a7efa..686fd73 100644
--- a/sys/dev/isp/isp_target.c
+++ b/sys/dev/isp/isp_target.c
@@ -606,8 +606,8 @@ static void
isp_got_msg_fc(ispsoftc_t *isp, in_fcentry_t *inp)
{
isp_notify_t notify;
- static const char f1[] = "%s from N-port handle 0x%x lun %jx seq 0x%x";
- static const char f2[] = "unknown %s 0x%x lun %jx N-Port handle 0x%x task flags 0x%x seq 0x%x\n";
+ static const char f1[] = "%s from N-port handle 0x%x lun %x seq 0x%x";
+ static const char f2[] = "unknown %s 0x%x lun %x N-Port handle 0x%x task flags 0x%x seq 0x%x\n";
uint16_t seqid, nphdl;
ISP_MEMZERO(&notify, sizeof (isp_notify_t));
@@ -669,8 +669,8 @@ static void
isp_got_tmf_24xx(ispsoftc_t *isp, at7_entry_t *aep)
{
isp_notify_t notify;
- static const char f1[] = "%s from PortID 0x%06x lun %jx seq 0x%08x";
- static const char f2[] = "unknown Task Flag 0x%x lun %jx PortID 0x%x tag 0x%08x";
+ static const char f1[] = "%s from PortID 0x%06x lun %x seq 0x%08x";
+ static const char f2[] = "unknown Task Flag 0x%x lun %x PortID 0x%x tag 0x%08x";
fcportdb_t *lp;
uint16_t chan;
uint32_t sid, did;
OpenPOWER on IntegriCloud