From: Al Viro <v...@zeniv.linux.org.uk>
Signed-off-by: Al Viro <v...@zeniv.linux.org.uk>
---
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
--
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/
