From: Christoph Hellwig <hch@lst.de>
Date: Mon, 17 Aug 2020 17:17:20 +0000 (+0200)
Subject: mm: turn alloc_pages into an inline function
X-Git-Tag: io_uring-5.10-2020-10-20~45^2~30
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=43ee5b6daa6c45246098493dab2c229d196c9cf6;p=linux-block.git

mm: turn alloc_pages into an inline function

To prevent a compiler error when a method call alloc_pages is
added (which I plan to for the dma_map_ops).

Signed-off-by: Christoph Hellwig <hch@lst.de>
---

diff --git a/include/linux/gfp.h b/include/linux/gfp.h
index 67a0774e080b..dd2577c54071 100644
--- a/include/linux/gfp.h
+++ b/include/linux/gfp.h
@@ -550,8 +550,10 @@ extern struct page *alloc_pages_vma(gfp_t gfp_mask, int order,
 #define alloc_hugepage_vma(gfp_mask, vma, addr, order) \
 	alloc_pages_vma(gfp_mask, order, vma, addr, numa_node_id(), true)
 #else
-#define alloc_pages(gfp_mask, order) \
-		alloc_pages_node(numa_node_id(), gfp_mask, order)
+static inline struct page *alloc_pages(gfp_t gfp_mask, unsigned int order)
+{
+	return alloc_pages_node(numa_node_id(), gfp_mask, order);
+}
 #define alloc_pages_vma(gfp_mask, order, vma, addr, node, false)\
 	alloc_pages(gfp_mask, order)
 #define alloc_hugepage_vma(gfp_mask, vma, addr, order) \