From nobody Fri Jan 21 01:59:42 2022 X-Original-To: dev-commits-src-branches@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 052A21955A7E; Fri, 21 Jan 2022 01:59:43 +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 4Jg2ct4frMz4cny; Fri, 21 Jan 2022 01:59:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642730382; 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=VqcS8kYGvLzsDvoPVTtSB9EwjQkZyMAn1e3yx2RUciM=; b=O4ZpCKekcmy8J8Rf2ZrcT+AACAWuA94n4WkCw6FwsnJ83Xnnldr2CUuCLlb0YPAteg02fM J6TwTKBAMNR0u3yLTLgUNJcbHUBkwzKY39B+PDzJu7eFvYXo5N7/q4pt2dMCfXk8RjIxqv MhpzND76P2bpAh4cPpNIMxgJ72DBHpQ28kY3gSjj+2hjl8IwtpMLHxEINLjBQkHlg3nExv JZMvgYVpyBXMas/k48PGOpxjrpYYmE2NRrRDQTi9aEzPLg8Vt2BYg2d/nrewSURttqv3Yl pApTmBv2iDsQes1sOfsp1i/pJbPVwpZxBgMDuZ/EZOGERAhIrPLszY254t/g4g== 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 2BA2A131FF; Fri, 21 Jan 2022 01:59:42 +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 20L1xglE060777; Fri, 21 Jan 2022 01:59:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 20L1xgZP060776; Fri, 21 Jan 2022 01:59:42 GMT (envelope-from git) Date: Fri, 21 Jan 2022 01:59:42 GMT Message-Id: <202201210159.20L1xgZP060776@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alexander Motin Subject: git: d0cb410baa19 - stable/13 - Fix build. Sorry. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mav X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d0cb410baa1934159275644a172387f15a7925ac Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1642730382; 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=VqcS8kYGvLzsDvoPVTtSB9EwjQkZyMAn1e3yx2RUciM=; b=heFGi0x61RmGRCVOuNR7yUQ+Vuxp0Rf0kntAHnSllVu+jVGrY2aIg72wL9oSJ22zCcLe93 vY9X9ysaAVY+bfcCp/J1kiDLr0mdtbUzsCw0l0Anat0rn1L0iigUdOuShdAogEmPnfo1Gd qwTX+3m7+lxr+CG0jfScAK7mS4fCZ7MFzz1dsks0TlBb27LXnSad+qgF42XKnUlAaN0AuL Wmm+3dbkNQ4kVgRumximwMN34s1GZSNKz7LYc0HnmU35lkRv/WtWWSvHYgZfd4QgReufHX KADO6VmAzpDF1rqE3paufqvCLPVUpyBn5md3eGsKz0r8nFyg7bH4/IQlLZT3kw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1642730382; a=rsa-sha256; cv=none; b=p1zlNb1MI46tlra9B814goq69WOUgWOELxIFu5UPZYbnEXbuxxu/sXFAZzBqnFvmlwy/kL AUb44Jx2VjgV2Vv4YtbZ6kbHgu4KvAewaXioqRg4fiOsv32KRSOsAg/q4gi9Obgdtzt7Kq DOcavlnkiVHeYwgnc8qxzyhj945eDV/sVfxvF2aCr09UU7SXYTaRr5YhX0tGTwvnuYwWnp oQXxyjF+uOphl6D/z0ctUxpeHXPG8tEriSoP2HM2pfBTvlCtHh4ISH8rejGosQW69Bh+Wx a4Ajys7NDEFein9cbjonKyv8AtNtRYrzbwGcVEDk6xkt+wYcLpl1A0lOFh+f9w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by mav: URL: https://cgit.FreeBSD.org/src/commit/?id=d0cb410baa1934159275644a172387f15a7925ac commit d0cb410baa1934159275644a172387f15a7925ac Author: Alexander Motin AuthorDate: 2022-01-07 19:33:51 +0000 Commit: Alexander Motin CommitDate: 2022-01-21 01:59:34 +0000 Fix build. Sorry. MFC after: 2 weeks (cherry picked from commit 135c269d87c47890cc27309bdfedb98fe04021be) --- sys/cam/ctl/ctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c index 47176a5cb981..bc7f386bc091 100644 --- a/sys/cam/ctl/ctl.c +++ b/sys/cam/ctl/ctl.c @@ -5903,7 +5903,7 @@ ctl_ie_timer(void *arg) t = scsi_4btoul(lun->MODE_IE.interval_timer); if (t == 0 || t == UINT32_MAX) t = 3000; /* 5 min */ - callout_schedule(&lun->ie_callout, SBT_1S / 10 * t, + callout_schedule_sbt(&lun->ie_callout, SBT_1S / 10 * t, SBT_1S / 10, 0); } }