diff options
Diffstat (limited to 'arch/x86/kernel/amd_iommu.c')
-rw-r--r-- | arch/x86/kernel/amd_iommu.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86/kernel/amd_iommu.c b/arch/x86/kernel/amd_iommu.c index 8b45bc49d1c5..12e8b67e5881 100644 --- a/arch/x86/kernel/amd_iommu.c +++ b/arch/x86/kernel/amd_iommu.c | |||
@@ -820,9 +820,9 @@ static struct protection_domain *domain_for_device(u16 devid) | |||
820 | * If a device is not yet associated with a domain, this function does | 820 | * If a device is not yet associated with a domain, this function does |
821 | * assigns it visible for the hardware | 821 | * assigns it visible for the hardware |
822 | */ | 822 | */ |
823 | static void set_device_domain(struct amd_iommu *iommu, | 823 | static void attach_device(struct amd_iommu *iommu, |
824 | struct protection_domain *domain, | 824 | struct protection_domain *domain, |
825 | u16 devid) | 825 | u16 devid) |
826 | { | 826 | { |
827 | unsigned long flags; | 827 | unsigned long flags; |
828 | u64 pte_root = virt_to_phys(domain->pt_root); | 828 | u64 pte_root = virt_to_phys(domain->pt_root); |
@@ -929,14 +929,14 @@ static int get_device_resources(struct device *dev, | |||
929 | if (!dma_dom) | 929 | if (!dma_dom) |
930 | dma_dom = (*iommu)->default_dom; | 930 | dma_dom = (*iommu)->default_dom; |
931 | *domain = &dma_dom->domain; | 931 | *domain = &dma_dom->domain; |
932 | set_device_domain(*iommu, *domain, *bdf); | 932 | attach_device(*iommu, *domain, *bdf); |
933 | printk(KERN_INFO "AMD IOMMU: Using protection domain %d for " | 933 | printk(KERN_INFO "AMD IOMMU: Using protection domain %d for " |
934 | "device ", (*domain)->id); | 934 | "device ", (*domain)->id); |
935 | print_devid(_bdf, 1); | 935 | print_devid(_bdf, 1); |
936 | } | 936 | } |
937 | 937 | ||
938 | if (domain_for_device(_bdf) == NULL) | 938 | if (domain_for_device(_bdf) == NULL) |
939 | set_device_domain(*iommu, *domain, _bdf); | 939 | attach_device(*iommu, *domain, _bdf); |
940 | 940 | ||
941 | return 1; | 941 | return 1; |
942 | } | 942 | } |