diff options
| author | Jason Gunthorpe <jgg@nvidia.com> | 2023-02-21 11:11:03 -0400 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@nvidia.com> | 2023-02-21 11:11:03 -0400 |
| commit | 939204e4df962982cbc84acc26b29b421dd530a8 (patch) | |
| tree | 753698947a28ff1f18857d198a671317352f16c8 /kernel/irq/irqdomain.c | |
| parent | b4ff830eca097df51af10a9be29e8cc817327919 (diff) | |
| parent | c9c3395d5e3dcc6daee66c6908354d47bf98cb0c (diff) | |
| download | lwn-939204e4df962982cbc84acc26b29b421dd530a8.tar.gz lwn-939204e4df962982cbc84acc26b29b421dd530a8.zip | |
Merge tag 'v6.2' into iommufd.git for-next
Resolve conflicts from the signature change in iommu_map:
- drivers/infiniband/hw/usnic/usnic_uiom.c
Switch iommu_map_atomic() to iommu_map(.., GFP_ATOMIC)
- drivers/vfio/vfio_iommu_type1.c
Following indenting change for GFP_KERNEL
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Diffstat (limited to 'kernel/irq/irqdomain.c')
| -rw-r--r-- | kernel/irq/irqdomain.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/kernel/irq/irqdomain.c b/kernel/irq/irqdomain.c index 104954951582..9d1b3ab07a16 100644 --- a/kernel/irq/irqdomain.c +++ b/kernel/irq/irqdomain.c @@ -114,7 +114,7 @@ void irq_domain_free_fwnode(struct fwnode_handle *fwnode) { struct irqchip_fwid *fwid; - if (WARN_ON(!is_fwnode_irqchip(fwnode))) + if (!fwnode || WARN_ON(!is_fwnode_irqchip(fwnode))) return; fwid = container_of(fwnode, struct irqchip_fwid, fwnode); @@ -1876,7 +1876,7 @@ static void debugfs_add_domain_dir(struct irq_domain *d) static void debugfs_remove_domain_dir(struct irq_domain *d) { - debugfs_remove(debugfs_lookup(d->name, domain_dir)); + debugfs_lookup_and_remove(d->name, domain_dir); } void __init irq_domain_debugfs_init(struct dentry *root) |