aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/futex.c
diff options
context:
space:
mode:
Diffstat (limited to 'kernel/futex.c')
-rw-r--r--kernel/futex.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/futex.c b/kernel/futex.c
index 11cbe052b2e8..1511dff0cfd6 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -854,7 +854,7 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this)
854{ 854{
855 struct task_struct *new_owner; 855 struct task_struct *new_owner;
856 struct futex_pi_state *pi_state = this->pi_state; 856 struct futex_pi_state *pi_state = this->pi_state;
857 u32 curval, newval; 857 u32 uninitialized_var(curval), newval;
858 858
859 if (!pi_state) 859 if (!pi_state)
860 return -EINVAL; 860 return -EINVAL;
@@ -916,7 +916,7 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this)
916 916
917static int unlock_futex_pi(u32 __user *uaddr, u32 uval) 917static int unlock_futex_pi(u32 __user *uaddr, u32 uval)
918{ 918{
919 u32 oldval; 919 u32 uninitialized_var(oldval);
920 920
921 /* 921 /*
922 * There is no waiter, so we unlock the futex. The owner died 922 * There is no waiter, so we unlock the futex. The owner died
@@ -1576,7 +1576,7 @@ static int fixup_pi_state_owner(u32 __user *uaddr, struct futex_q *q,
1576 u32 newtid = task_pid_vnr(newowner) | FUTEX_WAITERS; 1576 u32 newtid = task_pid_vnr(newowner) | FUTEX_WAITERS;
1577 struct futex_pi_state *pi_state = q->pi_state; 1577 struct futex_pi_state *pi_state = q->pi_state;
1578 struct task_struct *oldowner = pi_state->owner; 1578 struct task_struct *oldowner = pi_state->owner;
1579 u32 uval, curval, newval; 1579 u32 uval, uninitialized_var(curval), newval;
1580 int ret; 1580 int ret;
1581 1581
1582 /* Owner died? */ 1582 /* Owner died? */
@@ -1793,7 +1793,7 @@ static void futex_wait_queue_me(struct futex_hash_bucket *hb, struct futex_q *q,
1793 * 1793 *
1794 * Returns: 1794 * Returns:
1795 * 0 - uaddr contains val and hb has been locked 1795 * 0 - uaddr contains val and hb has been locked
1796 * <1 - -EFAULT or -EWOULDBLOCK (uaddr does not contain val) and hb is unlcoked 1796 * <1 - -EFAULT or -EWOULDBLOCK (uaddr does not contain val) and hb is unlocked
1797 */ 1797 */
1798static int futex_wait_setup(u32 __user *uaddr, u32 val, unsigned int flags, 1798static int futex_wait_setup(u32 __user *uaddr, u32 val, unsigned int flags,
1799 struct futex_q *q, struct futex_hash_bucket **hb) 1799 struct futex_q *q, struct futex_hash_bucket **hb)
@@ -2481,7 +2481,7 @@ err_unlock:
2481 */ 2481 */
2482int handle_futex_death(u32 __user *uaddr, struct task_struct *curr, int pi) 2482int handle_futex_death(u32 __user *uaddr, struct task_struct *curr, int pi)
2483{ 2483{
2484 u32 uval, nval, mval; 2484 u32 uval, uninitialized_var(nval), mval;
2485 2485
2486retry: 2486retry:
2487 if (get_user(uval, uaddr)) 2487 if (get_user(uval, uaddr))