From 4b86ebafb5459d58b4f6edfb15e662e98db684ee Mon Sep 17 00:00:00 2001 From: Andi Kleen Date: Fri, 4 Mar 2011 17:36:30 -0800 Subject: [PATCH] --- yaml --- r: 233923 b: refs/heads/master c: 236344d6b417d05a3080477639234fd9ca97568d h: refs/heads/master i: 233921: a4c8aa5224afe4cb343eef8088b85355c94e03c9 233919: f6cfa10cb06c146cef6237bf7d7a975b71756f3e v: v3 --- [refs] | 2 +- trunk/include/linux/gfp.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index a3ace81177fd..f2b8ff1be696 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 2f5f9486f8c12e3aa40fe3775a18cb14efc5cea2 +refs/heads/master: 236344d6b417d05a3080477639234fd9ca97568d diff --git a/trunk/include/linux/gfp.h b/trunk/include/linux/gfp.h index 37b8af5db091..dca31761b311 100644 --- a/trunk/include/linux/gfp.h +++ b/trunk/include/linux/gfp.h @@ -343,6 +343,8 @@ extern struct page *alloc_pages_vma(gfp_t gfp_mask, int order, #define alloc_page(gfp_mask) alloc_pages(gfp_mask, 0) #define alloc_page_vma(gfp_mask, vma, addr) \ alloc_pages_vma(gfp_mask, 0, vma, addr, numa_node_id()) +#define alloc_page_vma_node(gfp_mask, vma, addr, node) \ + alloc_pages_vma(gfp_mask, 0, vma, addr, node) extern unsigned long __get_free_pages(gfp_t gfp_mask, unsigned int order); extern unsigned long get_zeroed_page(gfp_t gfp_mask);