aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--include/linux/gfp.h2
-rw-r--r--mm/page_alloc.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/gfp.h b/include/linux/gfp.h
index 6eb1fb37de9a..5e7219dc0fae 100644
--- a/include/linux/gfp.h
+++ b/include/linux/gfp.h
@@ -360,7 +360,7 @@ extern unsigned long get_zeroed_page(gfp_t gfp_mask);
360void *alloc_pages_exact(size_t size, gfp_t gfp_mask); 360void *alloc_pages_exact(size_t size, gfp_t gfp_mask);
361void free_pages_exact(void *virt, size_t size); 361void free_pages_exact(void *virt, size_t size);
362/* This is different from alloc_pages_exact_node !!! */ 362/* This is different from alloc_pages_exact_node !!! */
363void *alloc_pages_exact_nid(int nid, size_t size, gfp_t gfp_mask); 363void * __meminit alloc_pages_exact_nid(int nid, size_t size, gfp_t gfp_mask);
364 364
365#define __get_free_page(gfp_mask) \ 365#define __get_free_page(gfp_mask) \
366 __get_free_pages((gfp_mask), 0) 366 __get_free_pages((gfp_mask), 0)
diff --git a/mm/page_alloc.c b/mm/page_alloc.c
index ef44ad736ca1..fd4322cc096d 100644
--- a/mm/page_alloc.c
+++ b/mm/page_alloc.c
@@ -2962,7 +2962,7 @@ EXPORT_SYMBOL(alloc_pages_exact);
2962 * Note this is not alloc_pages_exact_node() which allocates on a specific node, 2962 * Note this is not alloc_pages_exact_node() which allocates on a specific node,
2963 * but is not exact. 2963 * but is not exact.
2964 */ 2964 */
2965void *alloc_pages_exact_nid(int nid, size_t size, gfp_t gfp_mask) 2965void * __meminit alloc_pages_exact_nid(int nid, size_t size, gfp_t gfp_mask)
2966{ 2966{
2967 unsigned order = get_order(size); 2967 unsigned order = get_order(size);
2968 struct page *p = alloc_pages_node(nid, gfp_mask, order); 2968 struct page *p = alloc_pages_node(nid, gfp_mask, order);