summaryrefslogtreecommitdiffstats
path: root/drivers/iommu
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2022-08-18 17:37:22 +0200
committerThomas Gleixner <tglx@linutronix.de>2022-08-18 17:37:22 +0200
commit57646d6769f13f9484ffc6869c493e25a6568073 (patch)
treebaa4e667e2db692120ecf30f4f1b66acd5fb01c7 /drivers/iommu
parent568035b01cfb107af8d2e4bd2fb9aea22cf5b868 (diff)
parenta9084d888fbaaed65ded56f11d052cf8b04519a5 (diff)
downloadlinux-57646d6769f13f9484ffc6869c493e25a6568073.tar.gz
linux-57646d6769f13f9484ffc6869c493e25a6568073.tar.bz2
linux-57646d6769f13f9484ffc6869c493e25a6568073.zip
Merge tag 'irqchip-fixes-6.0-1' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/urgent
Pull irqchip fixes from Marc Zyngier: - A bunch of small fixes for the recently merged LoongArch drivers - A leftover from the non-SMP IRQ affinity rework affecting the Hyper-V IOMMU code Link: https://lore.kernel.org/r/20220812125910.2227338-1-maz@kernel.org
Diffstat (limited to 'drivers/iommu')
-rw-r--r--drivers/iommu/hyperv-iommu.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/iommu/hyperv-iommu.c b/drivers/iommu/hyperv-iommu.c
index 51bd66a45a11..e190bb8c225c 100644
--- a/drivers/iommu/hyperv-iommu.c
+++ b/drivers/iommu/hyperv-iommu.c
@@ -68,7 +68,6 @@ static int hyperv_irq_remapping_alloc(struct irq_domain *domain,
{
struct irq_alloc_info *info = arg;
struct irq_data *irq_data;
- struct irq_desc *desc;
int ret = 0;
if (!info || info->type != X86_IRQ_ALLOC_TYPE_IOAPIC || nr_irqs > 1)
@@ -90,8 +89,7 @@ static int hyperv_irq_remapping_alloc(struct irq_domain *domain,
* Hypver-V IO APIC irq affinity should be in the scope of
* ioapic_max_cpumask because no irq remapping support.
*/
- desc = irq_data_to_desc(irq_data);
- cpumask_copy(desc->irq_common_data.affinity, &ioapic_max_cpumask);
+ irq_data_update_affinity(irq_data, &ioapic_max_cpumask);
return 0;
}