From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752880AbbLUXvV (ORCPT ); Mon, 21 Dec 2015 18:51:21 -0500 Received: from zeniv.linux.org.uk ([195.92.253.2]:33126 "EHLO ZenIV.linux.org.uk" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752390AbbLUXsM (ORCPT ); Mon, 21 Dec 2015 18:48:12 -0500 From: Al Viro To: linux-kernel@vger.kernel.org Cc: Linus Torvalds Subject: [POC][PATCH 75/83] kill __get_free_page() Date: Mon, 21 Dec 2015 23:47:48 +0000 Message-Id: <1450741676-5865-75-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 --- drivers/acpi/apei/ghes.c | 2 +- include/linux/gfp.h | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c index 1d074de..3c02819 100644 --- a/drivers/acpi/apei/ghes.c +++ b/drivers/acpi/apei/ghes.c @@ -223,7 +223,7 @@ static int ghes_estatus_pool_expand(unsigned long len) return 0; pages = (ghes_estatus_pool_size_request - size) / PAGE_SIZE; for (i = 0; i < pages; i++) { - addr = __get_free_page(GFP_KERNEL); + addr = (unsigned long)get_free_page(GFP_KERNEL); if (!addr) return -ENOMEM; ret = gen_pool_add(ghes_estatus_pool, addr, PAGE_SIZE, -1); diff --git a/include/linux/gfp.h b/include/linux/gfp.h index bb1626a..c929a04 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h @@ -485,9 +485,6 @@ void * __meminit alloc_pages_exact_nid(int nid, size_t size, gfp_t gfp_mask); #define get_free_page(gfp_mask) \ get_free_pages((gfp_mask), 0) -#define __get_free_page(gfp_mask) \ - __get_free_pages((gfp_mask), 0) - #define get_dma_pages(gfp_mask, order) \ get_free_pages((gfp_mask) | GFP_DMA, (order)) -- 2.1.4