From: Florian Fainelli <florian.fainelli@broadcom.com>
To: stable@vger.kernel.org
Cc: bcm-kernel-feedback-list@broadcom.com,
Florian Fainelli <florian.fainelli@broadcom.com>,
Jeff Dike <jdike@addtoit.com>,
Richard Weinberger <richard@nod.at>,
Anton Ivanov <anton.ivanov@cambridgegreys.com>,
Benjamin Berg <benjamin.berg@intel.com>,
Sasha Levin <sashal@kernel.org>,
linux-um@lists.infradead.org (open list:USER-MODE LINUX (UML)),
linux-kernel@vger.kernel.org (open list)
Subject: [PATCH stable 5.15] um: virt-pci: Fix build failure
Date: Fri, 8 May 2026 13:52:41 -0700 [thread overview]
Message-ID: <20260508205241.962178-1-florian.fainelli@broadcom.com> (raw)
Commit a27e95a6ff3f ("um: virt-pci: properly remove PCI device from
bus") assumed that virtio_reset_device() is present in the 5.15.y kernel
but it is not and so backport would now cause a build failure.
Fixes: a27e95a6ff3f ("um: virt-pci: properly remove PCI device from bus")
Signed-off-by: Florian Fainelli <florian.fainelli@broadcom.com>
---
arch/um/drivers/virt-pci.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/um/drivers/virt-pci.c b/arch/um/drivers/virt-pci.c
index d762d726b66c..0666c9e0998d 100644
--- a/arch/um/drivers/virt-pci.c
+++ b/arch/um/drivers/virt-pci.c
@@ -641,7 +641,7 @@ static void um_pci_virtio_remove(struct virtio_device *vdev)
}
/* Stop all virtqueues */
- virtio_reset_device(vdev);
+ vdev->config->reset(vdev);
dev->cmd_vq = NULL;
dev->irq_vq = NULL;
vdev->config->del_vqs(vdev);
--
2.43.0
next reply other threads:[~2026-05-08 20:58 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-08 20:52 Florian Fainelli [this message]
2026-05-09 2:08 ` [PATCH stable 5.15] um: virt-pci: Fix build failure Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260508205241.962178-1-florian.fainelli@broadcom.com \
--to=florian.fainelli@broadcom.com \
--cc=anton.ivanov@cambridgegreys.com \
--cc=bcm-kernel-feedback-list@broadcom.com \
--cc=benjamin.berg@intel.com \
--cc=jdike@addtoit.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-um@lists.infradead.org \
--cc=richard@nod.at \
--cc=sashal@kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox