diff options
author | Joerg Roedel <joerg.roedel@amd.com> | 2009-11-27 07:25:47 -0500 |
---|---|---|
committer | Joerg Roedel <joerg.roedel@amd.com> | 2009-11-27 08:20:37 -0500 |
commit | 492667dacc0ac9763969155482b1261b34ccf450 (patch) | |
tree | eed52c260d2e10603a914e82d8bca766067e6c76 /arch/x86/kernel/amd_iommu_init.c | |
parent | 8eed9833346781dd15e3bef35a91b0a40787ea3c (diff) |
x86/amd-iommu: Remove amd_iommu_pd_table
The data that was stored in this table is now available in
dev->archdata.iommu. So this table is not longer necessary.
This patch removes the remaining uses of that variable and
removes it from the code.
Signed-off-by: Joerg Roedel <joerg.roedel@amd.com>
Diffstat (limited to 'arch/x86/kernel/amd_iommu_init.c')
-rw-r--r-- | arch/x86/kernel/amd_iommu_init.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/arch/x86/kernel/amd_iommu_init.c b/arch/x86/kernel/amd_iommu_init.c index fe1686f6f91b..7ffc39965233 100644 --- a/arch/x86/kernel/amd_iommu_init.c +++ b/arch/x86/kernel/amd_iommu_init.c | |||
@@ -165,12 +165,6 @@ u16 *amd_iommu_alias_table; | |||
165 | struct amd_iommu **amd_iommu_rlookup_table; | 165 | struct amd_iommu **amd_iommu_rlookup_table; |
166 | 166 | ||
167 | /* | 167 | /* |
168 | * The pd table (protection domain table) is used to find the protection domain | ||
169 | * data structure a device belongs to. Indexed with the PCI device id too. | ||
170 | */ | ||
171 | struct protection_domain **amd_iommu_pd_table; | ||
172 | |||
173 | /* | ||
174 | * AMD IOMMU allows up to 2^16 differend protection domains. This is a bitmap | 168 | * AMD IOMMU allows up to 2^16 differend protection domains. This is a bitmap |
175 | * to know which ones are already in use. | 169 | * to know which ones are already in use. |
176 | */ | 170 | */ |
@@ -1238,15 +1232,6 @@ static int __init amd_iommu_init(void) | |||
1238 | if (amd_iommu_rlookup_table == NULL) | 1232 | if (amd_iommu_rlookup_table == NULL) |
1239 | goto free; | 1233 | goto free; |
1240 | 1234 | ||
1241 | /* | ||
1242 | * Protection Domain table - maps devices to protection domains | ||
1243 | * This table has the same size as the rlookup_table | ||
1244 | */ | ||
1245 | amd_iommu_pd_table = (void *)__get_free_pages(GFP_KERNEL | __GFP_ZERO, | ||
1246 | get_order(rlookup_table_size)); | ||
1247 | if (amd_iommu_pd_table == NULL) | ||
1248 | goto free; | ||
1249 | |||
1250 | amd_iommu_pd_alloc_bitmap = (void *)__get_free_pages( | 1235 | amd_iommu_pd_alloc_bitmap = (void *)__get_free_pages( |
1251 | GFP_KERNEL | __GFP_ZERO, | 1236 | GFP_KERNEL | __GFP_ZERO, |
1252 | get_order(MAX_DOMAIN_ID/8)); | 1237 | get_order(MAX_DOMAIN_ID/8)); |
@@ -1314,9 +1299,6 @@ free: | |||
1314 | free_pages((unsigned long)amd_iommu_pd_alloc_bitmap, | 1299 | free_pages((unsigned long)amd_iommu_pd_alloc_bitmap, |
1315 | get_order(MAX_DOMAIN_ID/8)); | 1300 | get_order(MAX_DOMAIN_ID/8)); |
1316 | 1301 | ||
1317 | free_pages((unsigned long)amd_iommu_pd_table, | ||
1318 | get_order(rlookup_table_size)); | ||
1319 | |||
1320 | free_pages((unsigned long)amd_iommu_rlookup_table, | 1302 | free_pages((unsigned long)amd_iommu_rlookup_table, |
1321 | get_order(rlookup_table_size)); | 1303 | get_order(rlookup_table_size)); |
1322 | 1304 | ||