From nobody Wed Jan 04 01:04:13 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4NmrwG0N3xz2pMLK; Wed, 4 Jan 2023 01:04:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NmrwF719Jz3n3F; Wed, 4 Jan 2023 01:04:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672794254; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qTieRxRRuNn6KLtbrO/docCezcJu+fgbquYkvrJiR0c=; b=cbUyq1cnnup3brLLCjtPOks/WHK5/ZsTvdIfi5B76c92FjabW5BK4VW+gSvKsvlpU1W3eY jiIHyoJUAWpTj2kgr+6geyj8sXDz6JLDeZShQHQjekttWT9oWkQ8Po54Tr6OaxmKivlEtH /e16tsgIpsqkKy2r3IMJSazwWzAq8AMHB+WYTK4LG5RvvF54TLyfxD9IWkbr8Esn9nCP7M 1GtcRyBPk+KeBMYYdxqv53UXodEYh5cZIlsodctyGDngzcQBAeM3L6F9FviwJO2dQIYRW5 nZSJKY4sPr2GfW3rZ84uMjf5YbOd7DIXXN+s7v44zjaKA5TiaaogBqQK7NFgSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672794254; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qTieRxRRuNn6KLtbrO/docCezcJu+fgbquYkvrJiR0c=; b=IpsE6hspzvvRvof3XUCmoR3yo2J5CASvmcB62oOuPFCMCxRuzV3/R7IguisCW9Qr9sdNnu s0+V+rgBorffHyg3x6iQGCPihdSX2kYGICCBA0J44WObtEM/hVWamOPv+C/oW0r+2Z2JHh S7iC5Q8xyh+q74IFNHRF3iEh3eky7nthDnrKZ4lZC0HeGFdXf5e3yRl/RW/FcoeF/HJcZF XJK9zLRC1VddaPzSuKd39N36H2MrSJ9itWzxVxf/sl0FPic+3NX2n1MyhvBgB7ajK05skU kcJTAHoHLbUYXTOmdwVQTZiLGebOXuDtTuyPngjiqoMAqEJzqwNjSMCi2bXp2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672794254; a=rsa-sha256; cv=none; b=JZlVre/7doY973kfNX7en518hmyp48TTFJzmPGqH2f9MFYYLQfq+9h/+hbj9BWfFTlvn9A hedp3IudPdiLS0hGpSS9r8hlYSjNOgDxDu5vDZvlWvrFcI74rrAGh0L90EaUo2k17bYhvA wxlhNGxj75I9nZyCo5nn4TQBRP/ZDT/IE0oPQo5SNzZe/YcuWuWCpkI9inDIaCX9Yft6hM FWKRk+RbUauFG28Gysnz/8RMg2RtYWTDokCam1arCTVtQ/09xAhW5174mcr2NMqH88BMoW edBCB//f1Ejvz0wD+O9VFW7E0wuclYbsJAAVHl//bFf/Bm2J6dfjG93glrdFHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4NmrwF65W6zs0h; Wed, 4 Jan 2023 01:04:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30414Dd0033670; Wed, 4 Jan 2023 01:04:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30414Dkj033669; Wed, 4 Jan 2023 01:04:13 GMT (envelope-from git) Date: Wed, 4 Jan 2023 01:04:13 GMT Message-Id: <202301040104.30414Dkj033669@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Takanori Watanabe Subject: git: eb03c1f81cbc - main - wdatwd: fix i386 build breakage. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: takawata X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eb03c1f81cbce1d248ebf872bcb035cc6fd7c5de Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by takawata: URL: https://cgit.FreeBSD.org/src/commit/?id=eb03c1f81cbce1d248ebf872bcb035cc6fd7c5de commit eb03c1f81cbce1d248ebf872bcb035cc6fd7c5de Author: Takanori Watanabe AuthorDate: 2023-01-03 23:30:32 +0000 Commit: Takanori Watanabe CommitDate: 2023-01-04 01:04:44 +0000 wdatwd: fix i386 build breakage. Formatting string for uint64_t has portablity issue and lead bulid breakage, so fix it. Reviewed by hrs Differential Revision: https://reviews.freebsd.org/D37937 --- sys/dev/wdatwd/wdatwd.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/sys/dev/wdatwd/wdatwd.c b/sys/dev/wdatwd/wdatwd.c index 4f00e69ad863..a4e2acac5eca 100644 --- a/sys/dev/wdatwd/wdatwd.c +++ b/sys/dev/wdatwd/wdatwd.c @@ -363,8 +363,12 @@ wdatwd_event(void *private, u_int cmd, int *error) if (wdatwd_get_current_countdown(sc, &cur[1]) != 0) cur[1] = 0; WDATWD_VERBOSE_PRINTF(sc->dev, "cmd: %u, sc->running: " - "%d -> %d, cnt: %lu -> %lu, cur: %lu -> %lu\n", cmd, - run[0], run[1], cnt[0], cnt[1], cur[0], cur[1]); + "%d -> %d, cnt: %llu -> %llu, cur: %llu -> %llu\n", cmd, + run[0], run[1], + (unsigned long long) cnt[0], + (unsigned long long) cnt[1], + (unsigned long long)cur[0], + (unsigned long long)cur[1]); } return; @@ -674,7 +678,7 @@ wdatwd_attach(device_t dev) for (i = 0; i < nitems(sc->action); ++i) STAILQ_FOREACH(wdat, &sc->action[i], next) { WDATWD_VERBOSE_PRINTF(dev, "action: 0x%02x, " - "%s %s at 0x%lx (%d bit(s), offset %d bit(s))\n", + "%s %s at 0x%llx (%d bit(s), offset %d bit(s))\n", i, wdat->entry.RegisterRegion.SpaceId == ACPI_ADR_SPACE_SYSTEM_MEMORY @@ -692,6 +696,7 @@ wdatwd_attach(device_t dev) : wdat->entry.RegisterRegion.AccessWidth == 4 ? "qword" : "undef", + (unsigned long long ) wdat->entry.RegisterRegion.Address, wdat->entry.RegisterRegion.BitWidth, wdat->entry.RegisterRegion.BitOffset); @@ -729,16 +734,18 @@ wdatwd_attach(device_t dev) dev, res->type, &res->rid, RF_ACTIVE); if (res->res == NULL) { bus_delete_resource(dev, res->type, res->rid); - device_printf(dev, "%s at 0x%lx (%ld byte(s)): " + device_printf(dev, "%s at 0x%llx (%lld byte(s)): " "alloc' failed\n", res->type == SYS_RES_MEMORY ? "mem" : "io ", - res->start, res->end - res->start); + (unsigned long long )res->start, + (unsigned long long )(res->end - res->start)); goto fail; } - WDATWD_VERBOSE_PRINTF(dev, "%s at 0x%lx (%ld byte(s)): " + WDATWD_VERBOSE_PRINTF(dev, "%s at 0x%llx (%lld byte(s)): " "alloc'ed\n", res->type == SYS_RES_MEMORY ? "mem" : "io ", - res->start, res->end - res->start); + (unsigned long long )res->start, + (unsigned long long) (res->end - res->start)); } /* Initialize the watchdog hardware. */