summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2022-01-13 09:57:44 -0600
committerBjorn Helgaas <bhelgaas@google.com>2022-01-13 09:57:44 -0600
commitc6ff0f8dc05fc4137e0bc4a2e2d468430027df98 (patch)
treee7ce78d2f29d417bfaefdd2e3c104454cbf5425d /drivers/pci
parent446cc1c51a5a562fea13bdf875d77e813615058d (diff)
parent69f457b18fa2b9a793ce61e8d1cf295983aca3a9 (diff)
downloadlinux-c6ff0f8dc05fc4137e0bc4a2e2d468430027df98.tar.bz2
Merge branch 'pci/p2pdma'
- Add Logan Gunthorpe as P2PDMA maintainer (Bjorn Helgaas) - Optimize by using percpu_ref_tryget_live_rcu() inside RCU critical section (Christophe JAILLET) * pci/p2pdma: PCI/P2PDMA: Use percpu_ref_tryget_live_rcu() inside RCU critical section MAINTAINERS: Add Logan Gunthorpe as P2PDMA maintainer
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/p2pdma.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/pci/p2pdma.c b/drivers/pci/p2pdma.c
index 8d47cb7218d1..081c391690d4 100644
--- a/drivers/pci/p2pdma.c
+++ b/drivers/pci/p2pdma.c
@@ -710,7 +710,7 @@ void *pci_alloc_p2pmem(struct pci_dev *pdev, size_t size)
if (!ret)
goto out;
- if (unlikely(!percpu_ref_tryget_live(ref))) {
+ if (unlikely(!percpu_ref_tryget_live_rcu(ref))) {
gen_pool_free(p2pdma->pool, (unsigned long) ret, size);
ret = NULL;
goto out;