Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fad23fc7 authored by Adrian Bunk's avatar Adrian Bunk Committed by Rusty Russell
Browse files

kernel/futex.c: make 3 functions static 



The following functions can now become static again:
- get_futex_key()
- get_futex_key_refs()
- drop_futex_key_refs()

Signed-off-by: default avatarAdrian Bunk <bunk@kernel.org>
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent 02c3530d

include/linux/futex.h

+0 −4
Original line number Diff line number Diff line
@@ -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);

kernel/futex.c

+4 −7
Original line number Diff line number Diff line
@@ -181,7 +181,7 @@ 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,

static int get_futex_key(u32 __user *uaddr, struct rw_semaphore *fshared,

			 union futex_key *key)

{

	unsigned long address = (unsigned long)uaddr;
@@ -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)

{