From cc79ae1430816365d676501d6563077d449a6b7d Mon Sep 17 00:00:00 2001
From: Rolf Eike Beer <eike-kernel@sf-tec.de>
Date: Wed, 27 Sep 2006 01:50:13 -0700
Subject: [PATCH] --- yaml --- r: 36160 b: refs/heads/master c:
 d24afc57d51b1be41f95521e81399061fa5875a6 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index 77610bfe32de..91454b54d3b8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: ead04089b138ed669658f80fafbe11fc7d97740b
+refs/heads/master: d24afc57d51b1be41f95521e81399061fa5875a6
diff --git a/trunk/include/linux/vmalloc.h b/trunk/include/linux/vmalloc.h
index dee88c6b6fa7..ce5f1482e6be 100644
--- a/trunk/include/linux/vmalloc.h
+++ b/trunk/include/linux/vmalloc.h
@@ -62,7 +62,6 @@ extern struct vm_struct *__get_vm_area(unsigned long size, unsigned long flags,
 extern struct vm_struct *get_vm_area_node(unsigned long size,
 					unsigned long flags, int node);
 extern struct vm_struct *remove_vm_area(void *addr);
-extern struct vm_struct *__remove_vm_area(void *addr);
 extern int map_vm_area(struct vm_struct *area, pgprot_t prot,
 			struct page ***pages);
 extern void unmap_vm_area(struct vm_struct *area);
diff --git a/trunk/mm/vmalloc.c b/trunk/mm/vmalloc.c
index 659ec634856a..1ac191ce5641 100644
--- a/trunk/mm/vmalloc.c
+++ b/trunk/mm/vmalloc.c
@@ -272,7 +272,7 @@ static struct vm_struct *__find_vm_area(void *addr)
 }
 
 /* Caller must hold vmlist_lock */
-struct vm_struct *__remove_vm_area(void *addr)
+static struct vm_struct *__remove_vm_area(void *addr)
 {
 	struct vm_struct **p, *tmp;