Skip to content

Commit

Permalink
futex: uninitialized warning corrections
Browse files Browse the repository at this point in the history
The variables here are really not used uninitialized.

kernel/futex.c: In function 'fixup_pi_state_owner.clone.17':
kernel/futex.c:1582:6: warning: 'curval' may be used uninitialized in this function
kernel/futex.c: In function 'handle_futex_death':
kernel/futex.c:2486:6: warning: 'nval' may be used uninitialized in this function
kernel/futex.c: In function 'do_futex':
kernel/futex.c:863:11: warning: 'curval' may be used uninitialized in this function
kernel/futex.c:828:6: note: 'curval' was declared here
kernel/futex.c:898:5: warning: 'oldval' may be used uninitialized in this function
kernel/futex.c:890:6: note: 'oldval' was declared here

Signed-off-by: Vitaliy Ivanov <vitalivanov@gmail.com>
Acked-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
  • Loading branch information
vitalivanov authored and Jiri Kosina committed Sep 15, 2011
1 parent 124ff4e commit 7cfdaf3
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions kernel/futex.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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? */
Expand Down Expand Up @@ -2451,7 +2451,7 @@ SYSCALL_DEFINE3(get_robust_list, int, pid,
*/
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))
Expand Down

0 comments on commit 7cfdaf3

Please sign in to comment.