From fc177d7779048a33d0c36c1b65980a82a9de0ff4 Mon Sep 17 00:00:00 2001
From: Adrian Bunk <bunk@kernel.org>
Date: Fri, 2 Nov 2007 16:43:22 +0100
Subject: [PATCH] --- yaml --- r: 73127 b: refs/heads/master c:
 fad23fc78b959dae89768e523c3a6f5edb83bbe9 h: refs/heads/master i:   73125:
 c9c18542f24ef121877b2a1e9717193fe26b6c01   73123:
 11b3422c281e9f367129ad58e5e22b1fd97718a3   73119:
 1b96d463f490634a847cfe85fcff83daf9560a8d v: v3

---
 [refs]                      |  2 +-
 trunk/include/linux/futex.h |  4 ----
 trunk/kernel/futex.c        | 11 ++++-------
 3 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/[refs] b/[refs]
index 641456a9aa0c..305666000b0a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 02c3530da6b926b31f89ba589da72eca49557edd
+refs/heads/master: fad23fc78b959dae89768e523c3a6f5edb83bbe9
diff --git a/trunk/include/linux/futex.h b/trunk/include/linux/futex.h
index 99650353adfa..92d420fe03f8 100644
--- a/trunk/include/linux/futex.h
+++ b/trunk/include/linux/futex.h
@@ -149,10 +149,6 @@ union futex_key {
 		int offset;
 	} both;
 };
-int get_futex_key(u32 __user *uaddr, struct rw_semaphore *shared,
-		  union futex_key *key);
-void get_futex_key_refs(union futex_key *key);
-void drop_futex_key_refs(union futex_key *key);
 
 #ifdef CONFIG_FUTEX
 extern void exit_robust_list(struct task_struct *curr);
diff --git a/trunk/kernel/futex.c b/trunk/kernel/futex.c
index 32710451dc20..9dc591ab681a 100644
--- a/trunk/kernel/futex.c
+++ b/trunk/kernel/futex.c
@@ -181,8 +181,8 @@ static inline int match_futex(union futex_key *key1, union futex_key *key2)
  * For other futexes, it points to &current->mm->mmap_sem and
  * caller must have taken the reader lock. but NOT any spinlocks.
  */
-int get_futex_key(u32 __user *uaddr, struct rw_semaphore *fshared,
-		  union futex_key *key)
+static int get_futex_key(u32 __user *uaddr, struct rw_semaphore *fshared,
+			 union futex_key *key)
 {
 	unsigned long address = (unsigned long)uaddr;
 	struct mm_struct *mm = current->mm;
@@ -268,14 +268,13 @@ int get_futex_key(u32 __user *uaddr, struct rw_semaphore *fshared,
 	}
 	return err;
 }
-EXPORT_SYMBOL_GPL(get_futex_key);
 
 /*
  * Take a reference to the resource addressed by a key.
  * Can be called while holding spinlocks.
  *
  */
-inline void get_futex_key_refs(union futex_key *key)
+static void get_futex_key_refs(union futex_key *key)
 {
 	if (key->both.ptr == 0)
 		return;
@@ -288,13 +287,12 @@ inline void get_futex_key_refs(union futex_key *key)
 			break;
 	}
 }
-EXPORT_SYMBOL_GPL(get_futex_key_refs);
 
 /*
  * Drop a reference to the resource addressed by a key.
  * The hash bucket spinlock must not be held.
  */
-void drop_futex_key_refs(union futex_key *key)
+static void drop_futex_key_refs(union futex_key *key)
 {
 	if (!key->both.ptr)
 		return;
@@ -307,7 +305,6 @@ void drop_futex_key_refs(union futex_key *key)
 			break;
 	}
 }
-EXPORT_SYMBOL_GPL(drop_futex_key_refs);
 
 static u32 cmpxchg_futex_value_locked(u32 __user *uaddr, u32 uval, u32 newval)
 {