From: Al Viro <v...@zeniv.linux.org.uk> Signed-off-by: Al Viro <v...@zeniv.linux.org.uk> --- arch/x86/kernel/tce_64.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/arch/x86/kernel/tce_64.c b/arch/x86/kernel/tce_64.c index ab40954..c6d5208 100644 --- a/arch/x86/kernel/tce_64.c +++ b/arch/x86/kernel/tce_64.c @@ -98,7 +98,7 @@ static inline unsigned int table_size_to_number_of_entries(unsigned char size) static int tce_table_setparms(struct pci_dev *dev, struct iommu_table *tbl) { unsigned int bitmapsz; - unsigned long bmppages; + unsigned long *bmppages; int ret; tbl->it_busno = dev->bus->number; @@ -111,14 +111,14 @@ static int tce_table_setparms(struct pci_dev *dev, struct iommu_table *tbl) * entries; we need one bit per entry */ bitmapsz = tbl->it_size / BITS_PER_BYTE; - bmppages = __get_free_pages(GFP_KERNEL, get_order(bitmapsz)); + bmppages = get_free_pages(GFP_KERNEL, get_order(bitmapsz)); if (!bmppages) { printk(KERN_ERR "Calgary: cannot allocate bitmap\n"); ret = -ENOMEM; goto done; } - tbl->it_map = (unsigned long*)bmppages; + tbl->it_map = bmppages; memset(tbl->it_map, 0, bitmapsz); -- 2.1.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/