From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752711AbbLUXsv (ORCPT ); Mon, 21 Dec 2015 18:48:51 -0500 Received: from zeniv.linux.org.uk ([195.92.253.2]:33132 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752402AbbLUXsM (ORCPT ); Mon, 21 Dec 2015 18:48:12 -0500 From: Al Viro To: linux-kernel@vger.kernel.org Cc: Linus Torvalds Subject: [POC][PATCH 78/83] x86: switch to get_free_pages() Date: Mon, 21 Dec 2015 23:47:51 +0000 Message-Id: <1450741676-5865-78-git-send-email-viro@ZenIV.linux.org.uk> X-Mailer: git-send-email 1.7.7.6 In-Reply-To: <20151221234615.GW20997@ZenIV.linux.org.uk> References: <20151221234615.GW20997@ZenIV.linux.org.uk> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Al Viro Signed-off-by: Al Viro --- 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