diff options
author | Fabian Frederick <fabf@skynet.be> | 2016-08-22 15:11:31 -0400 |
---|---|---|
committer | Joerg Roedel <jroedel@suse.de> | 2016-09-05 06:42:27 -0400 |
commit | 395adae45095e55ee90e688e9021d79dd6ffaefe (patch) | |
tree | 5764efe0925b907b78f9834a9cf594568c44281d | |
parent | 517abe495df7279f3a45ae01ed709e07d384309e (diff) |
iommu/amd: Remove AMD_IOMMU_STATS
Commit e85e8f69cedb ("iommu/amd: Remove statistics code")
removed that configuration.
Also remove function definition (suggested by Joerg Roedel)
Signed-off-by: Fabian Frederick <fabf@skynet.be>
Signed-off-by: Joerg Roedel <jroedel@suse.de>
-rw-r--r-- | arch/x86/configs/x86_64_defconfig | 1 | ||||
-rw-r--r-- | drivers/iommu/amd_iommu_proto.h | 6 |
2 files changed, 0 insertions, 7 deletions
diff --git a/arch/x86/configs/x86_64_defconfig b/arch/x86/configs/x86_64_defconfig index d28bdabcc87e..7ef4a099defc 100644 --- a/arch/x86/configs/x86_64_defconfig +++ b/arch/x86/configs/x86_64_defconfig | |||
@@ -255,7 +255,6 @@ CONFIG_RTC_CLASS=y | |||
255 | CONFIG_DMADEVICES=y | 255 | CONFIG_DMADEVICES=y |
256 | CONFIG_EEEPC_LAPTOP=y | 256 | CONFIG_EEEPC_LAPTOP=y |
257 | CONFIG_AMD_IOMMU=y | 257 | CONFIG_AMD_IOMMU=y |
258 | CONFIG_AMD_IOMMU_STATS=y | ||
259 | CONFIG_INTEL_IOMMU=y | 258 | CONFIG_INTEL_IOMMU=y |
260 | # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set | 259 | # CONFIG_INTEL_IOMMU_DEFAULT_ON is not set |
261 | CONFIG_EFI_VARS=y | 260 | CONFIG_EFI_VARS=y |
diff --git a/drivers/iommu/amd_iommu_proto.h b/drivers/iommu/amd_iommu_proto.h index 0bd9eb374462..a1f3346736e5 100644 --- a/drivers/iommu/amd_iommu_proto.h +++ b/drivers/iommu/amd_iommu_proto.h | |||
@@ -78,12 +78,6 @@ static inline int amd_iommu_create_irq_domain(struct amd_iommu *iommu) | |||
78 | extern int amd_iommu_complete_ppr(struct pci_dev *pdev, int pasid, | 78 | extern int amd_iommu_complete_ppr(struct pci_dev *pdev, int pasid, |
79 | int status, int tag); | 79 | int status, int tag); |
80 | 80 | ||
81 | #ifndef CONFIG_AMD_IOMMU_STATS | ||
82 | |||
83 | static inline void amd_iommu_stats_init(void) { } | ||
84 | |||
85 | #endif /* !CONFIG_AMD_IOMMU_STATS */ | ||
86 | |||
87 | static inline bool is_rd890_iommu(struct pci_dev *pdev) | 81 | static inline bool is_rd890_iommu(struct pci_dev *pdev) |
88 | { | 82 | { |
89 | return (pdev->vendor == PCI_VENDOR_ID_ATI) && | 83 | return (pdev->vendor == PCI_VENDOR_ID_ATI) && |