From nobody Sat Sep 19 14:40:18 2026 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 4hnBwy4svVz6srrH for ; Sat, 19 Sep 2026 14:40:18 +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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hnBwy4Qt4z4WGs for ; Sat, 19 Sep 2026 14:40:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789828818; 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=qJ743lf/H8nC1YthFxZorNOLjG5sELxZ1j95qaSKihs=; b=J13aETGkIvxn4VAFp4+iHFMh2rJ9eTzxrSkQ0KSrAie+ENzuip5z4uLHoC0C3VMw7O6mWa U02KVTsyogm6zyvsk0AXrSh3TQGCoophr4ezbEn3V5NgRgUbsWVRcqu2lrsDRe9Ff8bX7y nJ7Fc2rbHiz+kgIL5X63zSw9229NCvZ5O8U0k070bKrHsZL0+EYtL4/xePcAjmimxJ5OGx e2VAcj2HW/KK0K0CYCsN+z7V0LlfLWZgGvlEaHBsNbHOfkys19r9u53RTLlSP5c/DLyeGu 1OKtv2907glwtJt/9EogOz3X2uR1Tefy6Lc1LGcuzh6loJnrgUq61d9WDCAi0A== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1789828818; b=rnIt/qSlfgHc76YlS4XvPN+Xxl3T/jNrldf7CECKybhQiCDo5Fnb1dFEvvdJbgVLBCCQb7 /5BUb3jNsZwBmKyW8Nnt7tLUwE/TvkbRUWHP98efTx/L83vNDszG5SL0Xsv4V0OftDYQru iUrHMUBpdgf50Vh1OxAJyOX/6nmjFmWcbMKoMLmv2nN44ajjOfH7RvWB0J+0WUEXnLn1CU 7noQ71d3+7KHSQZAuVDRlAvV1YXOOTvXYxScnRsrOdliJK7X8pNjfFR7/MsYG4HDVPDeeN EY6zSG2RafetIT8jiAywbm2UJs/A+nxWotr4KSwgvMD49gtc3ZhkjPhIVJNBLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1789828818; 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=qJ743lf/H8nC1YthFxZorNOLjG5sELxZ1j95qaSKihs=; b=sqW2PvcM7DIrAm9WGQSAZoSsSnIVXrlF9I/XIgJT4jfHPaNT1mbyf4f94ePqyrUi07d0Re YEh5OxuSRR8GFAXVMj7mYYMk44NH7kX/6FzODTnNPuidghV4XokuqhvdtSmE7Dncon7bbx UVE835VG4gac9Mn09JPifMEkpDiO9d6TYHQ90/jAMl6k1Q4Kz/PwngL7mwI/7lQ97DRKxD kj6X54ixOM+Ubd77QkafSPapPjqIwT8yetDVLBuYz4O7uo6G51fqWy1gxIs6QMJeA4UC+D NQAk2jjnarQOZ9+urL8ej396qFpowoldqeNzUWtJ4i2N/WlOPBJTQZMK3F3KbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hnBwy30Fvz17H0 for ; Sat, 19 Sep 2026 14:40:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 477e6 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 19 Sep 2026 14:40:18 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Bjoern A. Zeeb Subject: git: bf0e7356855b - stable/15 - mthca: apply upstream changes to convert to timer_setup() LinuxKPI 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: bf0e7356855b7084a5ea978e7ae16995b5a1b93b Auto-Submitted: auto-generated Date: Sat, 19 Sep 2026 14:40:18 +0000 Message-Id: <6aae9ed2.477e6.257f15ae@gitrepo.freebsd.org> The branch stable/15 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=bf0e7356855b7084a5ea978e7ae16995b5a1b93b commit bf0e7356855b7084a5ea978e7ae16995b5a1b93b Author: Bjoern A. Zeeb AuthorDate: 2026-09-14 22:27:26 +0000 Commit: Bjoern A. Zeeb CommitDate: 2026-09-19 09:34:08 +0000 mthca: apply upstream changes to convert to timer_setup() LinuxKPI Apply upstream changes b9eaf18722221 init_timer() -> setup_timer(), and 86cb30ec07cdc7 setup_timer() -> timer_setup() to get us out of Linux version 4.15 (and earlier) KPIs. Also apply 41cb08555c416 from_timer -> timer_container_of. Reviewed by: jhb, emaste Differential Revision: https://reviews.freebsd.org/D59677 (cherry picked from commit 9d467dfa31922b3b2fbb145f202200bf66ca550a) --- sys/dev/mthca/mthca_catas.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/sys/dev/mthca/mthca_catas.c b/sys/dev/mthca/mthca_catas.c index 9a66e87a5822..67ab6b6a43ff 100644 --- a/sys/dev/mthca/mthca_catas.c +++ b/sys/dev/mthca/mthca_catas.c @@ -132,9 +132,9 @@ static void handle_catas(struct mthca_dev *dev) spin_unlock_irqrestore(&catas_lock, flags); } -static void poll_catas(unsigned long dev_ptr) +static void poll_catas(struct timer_list *t) { - struct mthca_dev *dev = (struct mthca_dev *) dev_ptr; + struct mthca_dev *dev = timer_container_of(dev, t, catas_err.timer); int i; for (i = 0; i < dev->catas_err.size; ++i) @@ -151,7 +151,7 @@ void mthca_start_catas_poll(struct mthca_dev *dev) { phys_addr_t addr; - init_timer(&dev->catas_err.timer); + timer_setup(&dev->catas_err.timer, poll_catas, 0); dev->catas_err.map = NULL; addr = pci_resource_start(dev->pdev, 0) + @@ -166,8 +166,6 @@ void mthca_start_catas_poll(struct mthca_dev *dev) return; } - dev->catas_err.timer.data = (unsigned long) dev; - dev->catas_err.timer.function = poll_catas; dev->catas_err.timer.expires = jiffies + MTHCA_CATAS_POLL_INTERVAL; INIT_LIST_HEAD(&dev->catas_err.list); add_timer(&dev->catas_err.timer);