Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e1931811 authored by Fabian Frederick's avatar Fabian Frederick Committed by Linus Torvalds
Browse files

mm/page_alloc.c: add __meminit to alloc_pages_exact_nid() 



alloc_pages_exact_nid() is only called by __meminit alloc_page_cgroup()

Signed-off-by: default avatarFabian Frederick <fabf@skynet.be>
Cc: Mel Gorman <mgorman@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent f2765404

include/linux/gfp.h

+1 −1
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ extern unsigned long get_zeroed_page(gfp_t gfp_mask); 
void *alloc_pages_exact(size_t size, gfp_t gfp_mask);

void free_pages_exact(void *virt, size_t size);

/* This is different from alloc_pages_exact_node !!! */

void *alloc_pages_exact_nid(int nid, size_t size, gfp_t gfp_mask);

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)

mm/page_alloc.c

+1 −1
Original line number Diff line number Diff line
@@ -2962,7 +2962,7 @@ EXPORT_SYMBOL(alloc_pages_exact); 
 * Note this is not alloc_pages_exact_node() which allocates on a specific node,

 * but is not exact.

 */

void *alloc_pages_exact_nid(int nid, size_t size, gfp_t gfp_mask)

void * __meminit alloc_pages_exact_nid(int nid, size_t size, gfp_t gfp_mask)

{

	unsigned order = get_order(size);

	struct page *p = alloc_pages_node(nid, gfp_mask, order);