This is no longer used outside of mm so reduce the scope. Ulterior motive for the move to mm/: A later patch will add an alloc_flags arg here. Signed-off-by: Brendan Jackman --- include/linux/gfp.h | 4 ---- mm/page_alloc.c | 1 - mm/page_alloc.h | 4 ++++ 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/include/linux/gfp.h b/include/linux/gfp.h index 572605d84e30e..17c14b8ca007d 100644 --- a/include/linux/gfp.h +++ b/include/linux/gfp.h @@ -203,10 +203,6 @@ static inline void arch_free_page(struct page *page, int order) { } static inline void arch_alloc_page(struct page *page, int order) { } #endif -struct folio *__folio_alloc_noprof(gfp_t gfp, unsigned int order, int preferred_nid, - nodemask_t *nodemask); -#define __folio_alloc(...) alloc_hooks(__folio_alloc_noprof(__VA_ARGS__)) - unsigned long alloc_pages_bulk_noprof(gfp_t gfp, int preferred_nid, nodemask_t *nodemask, int nr_pages, struct page **page_array); diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 86922270df157..ff8515e173e1e 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -5446,7 +5446,6 @@ struct folio *__folio_alloc_noprof(gfp_t gfp, unsigned int order, int preferred_ preferred_nid, nodemask, ALLOC_DEFAULT); return page_rmappable_folio(page); } -EXPORT_SYMBOL(__folio_alloc_noprof); struct folio *folio_alloc_node_noprof(gfp_t gfp, unsigned int order, int nid) { diff --git a/mm/page_alloc.h b/mm/page_alloc.h index b9259deddb59d..409be31898ae7 100644 --- a/mm/page_alloc.h +++ b/mm/page_alloc.h @@ -258,6 +258,10 @@ struct page *__alloc_pages_noprof(gfp_t gfp, unsigned int order, int preferred_n nodemask_t *nodemask, unsigned int alloc_flags); #define __alloc_pages(...) alloc_hooks(__alloc_pages_noprof(__VA_ARGS__)) +struct folio *__folio_alloc_noprof(gfp_t gfp, unsigned int order, int preferred_nid, + nodemask_t *nodemask); +#define __folio_alloc(...) alloc_hooks(__folio_alloc_noprof(__VA_ARGS__)) + extern void zone_pcp_reset(struct zone *zone); extern void zone_pcp_disable(struct zone *zone); extern void zone_pcp_enable(struct zone *zone); -- 2.54.0