diff options
Diffstat (limited to 'arch/x86_64/kernel/tce.c')
-rw-r--r-- | arch/x86_64/kernel/tce.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/arch/x86_64/kernel/tce.c b/arch/x86_64/kernel/tce.c index 8d4c67f61b8e..5530dda3f27a 100644 --- a/arch/x86_64/kernel/tce.c +++ b/arch/x86_64/kernel/tce.c | |||
@@ -1,8 +1,10 @@ | |||
1 | /* | 1 | /* |
2 | * Derived from arch/powerpc/platforms/pseries/iommu.c | 2 | * Derived from arch/powerpc/platforms/pseries/iommu.c |
3 | * | 3 | * |
4 | * Copyright (C) 2006 Jon Mason <jdmason@us.ibm.com>, IBM Corporation | 4 | * Copyright (C) IBM Corporation, 2006 |
5 | * Copyright (C) 2006 Muli Ben-Yehuda <muli@il.ibm.com>, IBM Corporation | 5 | * |
6 | * Author: Jon Mason <jdmason@us.ibm.com> | ||
7 | * Author: Muli Ben-Yehuda <muli@il.ibm.com> | ||
6 | * | 8 | * |
7 | * This program is free software; you can redistribute it and/or modify | 9 | * This program is free software; you can redistribute it and/or modify |
8 | * it under the terms of the GNU General Public License as published by | 10 | * it under the terms of the GNU General Public License as published by |
@@ -94,7 +96,6 @@ static inline unsigned int table_size_to_number_of_entries(unsigned char size) | |||
94 | static int tce_table_setparms(struct pci_dev *dev, struct iommu_table *tbl) | 96 | static int tce_table_setparms(struct pci_dev *dev, struct iommu_table *tbl) |
95 | { | 97 | { |
96 | unsigned int bitmapsz; | 98 | unsigned int bitmapsz; |
97 | unsigned int tce_table_index; | ||
98 | unsigned long bmppages; | 99 | unsigned long bmppages; |
99 | int ret; | 100 | int ret; |
100 | 101 | ||
@@ -103,8 +104,7 @@ static int tce_table_setparms(struct pci_dev *dev, struct iommu_table *tbl) | |||
103 | /* set the tce table size - measured in entries */ | 104 | /* set the tce table size - measured in entries */ |
104 | tbl->it_size = table_size_to_number_of_entries(specified_table_size); | 105 | tbl->it_size = table_size_to_number_of_entries(specified_table_size); |
105 | 106 | ||
106 | tce_table_index = bus_to_phb(tbl->it_busno); | 107 | tbl->it_base = (unsigned long)tce_table_kva[dev->bus->number]; |
107 | tbl->it_base = (unsigned long)tce_table_kva[tce_table_index]; | ||
108 | if (!tbl->it_base) { | 108 | if (!tbl->it_base) { |
109 | printk(KERN_ERR "Calgary: iommu_table_setparms: " | 109 | printk(KERN_ERR "Calgary: iommu_table_setparms: " |
110 | "no table allocated?!\n"); | 110 | "no table allocated?!\n"); |