54 lines
1.7 KiB
Diff
54 lines
1.7 KiB
Diff
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
Date: Thu, 22 Mar 2018 16:22:38 +0100
|
|
Subject: [PATCH 06/10] iommu/amd: Use `table' instead `irt' as variable name
|
|
in amd_iommu_update_ga()
|
|
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.16/older/patches-4.16.8-rt3.tar.xz
|
|
|
|
Upstream commit 4fde541c9dc114c5b448ad34b0286fe8b7c550f1
|
|
|
|
The variable of type struct irq_remap_table is always named `table'
|
|
except in amd_iommu_update_ga() where it is called `irt'. Make it
|
|
consistent and name it also `table'.
|
|
|
|
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
Signed-off-by: Joerg Roedel <jroedel@suse.de>
|
|
---
|
|
drivers/iommu/amd_iommu.c | 10 +++++-----
|
|
1 file changed, 5 insertions(+), 5 deletions(-)
|
|
|
|
--- a/drivers/iommu/amd_iommu.c
|
|
+++ b/drivers/iommu/amd_iommu.c
|
|
@@ -4391,7 +4391,7 @@ int amd_iommu_update_ga(int cpu, bool is
|
|
{
|
|
unsigned long flags;
|
|
struct amd_iommu *iommu;
|
|
- struct irq_remap_table *irt;
|
|
+ struct irq_remap_table *table;
|
|
struct amd_ir_data *ir_data = (struct amd_ir_data *)data;
|
|
int devid = ir_data->irq_2_irte.devid;
|
|
struct irte_ga *entry = (struct irte_ga *) ir_data->entry;
|
|
@@ -4405,11 +4405,11 @@ int amd_iommu_update_ga(int cpu, bool is
|
|
if (!iommu)
|
|
return -ENODEV;
|
|
|
|
- irt = get_irq_table(devid);
|
|
- if (!irt)
|
|
+ table = get_irq_table(devid);
|
|
+ if (!table)
|
|
return -ENODEV;
|
|
|
|
- raw_spin_lock_irqsave(&irt->lock, flags);
|
|
+ raw_spin_lock_irqsave(&table->lock, flags);
|
|
|
|
if (ref->lo.fields_vapic.guest_mode) {
|
|
if (cpu >= 0)
|
|
@@ -4418,7 +4418,7 @@ int amd_iommu_update_ga(int cpu, bool is
|
|
barrier();
|
|
}
|
|
|
|
- raw_spin_unlock_irqrestore(&irt->lock, flags);
|
|
+ raw_spin_unlock_irqrestore(&table->lock, flags);
|
|
|
|
iommu_flush_irt(iommu, devid);
|
|
iommu_completion_wait(iommu);
|