From 0d488b8b8379a48cd853e738c50ce85134c18e11 Mon Sep 17 00:00:00 2001
From: David Rientjes <rientjes@google.com>
Date: Thu, 13 Jan 2011 15:46:00 -0800
Subject: [PATCH] --- yaml --- r: 230717 b: refs/heads/master c:
 e5a5623b28198aa91ea71ee5d3846757fc76bc87 h: refs/heads/master i:   230715:
 d9361da6db436b928179dd9a3f9e72df49393209 v: v3

---
 [refs]                        | 2 +-
 trunk/include/linux/vmalloc.h | 3 ---
 trunk/mm/vmalloc.c            | 7 -------
 3 files changed, 1 insertion(+), 11 deletions(-)

diff --git a/[refs] b/[refs]
index 1dd329ab7c2e..52159a78f01d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f3a310bc4e5ce7e55e1c8e25c31e63af017f3e50
+refs/heads/master: e5a5623b28198aa91ea71ee5d3846757fc76bc87
diff --git a/trunk/include/linux/vmalloc.h b/trunk/include/linux/vmalloc.h
index 44b54f619ac6..cb73c755fac8 100644
--- a/trunk/include/linux/vmalloc.h
+++ b/trunk/include/linux/vmalloc.h
@@ -90,9 +90,6 @@ extern struct vm_struct *__get_vm_area_caller(unsigned long size,
 					unsigned long flags,
 					unsigned long start, unsigned long end,
 					void *caller);
-extern struct vm_struct *get_vm_area_node(unsigned long size,
-					  unsigned long flags, int node,
-					  gfp_t gfp_mask);
 extern struct vm_struct *remove_vm_area(const void *addr);
 
 extern int map_vm_area(struct vm_struct *area, pgprot_t prot,
diff --git a/trunk/mm/vmalloc.c b/trunk/mm/vmalloc.c
index 48245af07b10..78ec9d8bc57c 100644
--- a/trunk/mm/vmalloc.c
+++ b/trunk/mm/vmalloc.c
@@ -1315,13 +1315,6 @@ struct vm_struct *get_vm_area_caller(unsigned long size, unsigned long flags,
 						-1, GFP_KERNEL, caller);
 }
 
-struct vm_struct *get_vm_area_node(unsigned long size, unsigned long flags,
-				   int node, gfp_t gfp_mask)
-{
-	return __get_vm_area_node(size, 1, flags, VMALLOC_START, VMALLOC_END,
-				  node, gfp_mask, __builtin_return_address(0));
-}
-
 static struct vm_struct *find_vm_area(const void *addr)
 {
 	struct vmap_area *va;