|
@@ -825,7 +825,7 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this)
|
|
|
{
|
|
|
struct task_struct *new_owner;
|
|
|
struct futex_pi_state *pi_state = this->pi_state;
|
|
|
- u32 curval, newval;
|
|
|
+ u32 uninitialized_var(curval), newval;
|
|
|
|
|
|
if (!pi_state)
|
|
|
return -EINVAL;
|
|
@@ -887,7 +887,7 @@ static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_q *this)
|
|
|
|
|
|
static int unlock_futex_pi(u32 __user *uaddr, u32 uval)
|
|
|
{
|
|
|
- u32 oldval;
|
|
|
+ u32 uninitialized_var(oldval);
|
|
|
|
|
|
/*
|
|
|
* There is no waiter, so we unlock the futex. The owner died
|
|
@@ -1546,7 +1546,7 @@ static int fixup_pi_state_owner(u32 __user *uaddr, struct futex_q *q,
|
|
|
u32 newtid = task_pid_vnr(newowner) | FUTEX_WAITERS;
|
|
|
struct futex_pi_state *pi_state = q->pi_state;
|
|
|
struct task_struct *oldowner = pi_state->owner;
|
|
|
- u32 uval, curval, newval;
|
|
|
+ u32 uval, uninitialized_var(curval), newval;
|
|
|
int ret;
|
|
|
|
|
|
/* Owner died? */
|
|
@@ -2451,7 +2451,7 @@ err_unlock:
|
|
|
*/
|
|
|
int handle_futex_death(u32 __user *uaddr, struct task_struct *curr, int pi)
|
|
|
{
|
|
|
- u32 uval, nval, mval;
|
|
|
+ u32 uval, uninitialized_var(nval), mval;
|
|
|
|
|
|
retry:
|
|
|
if (get_user(uval, uaddr))
|