From c702d68e4cb34e6f50fe4f60989a5d5538ed6ee5 Mon Sep 17 00:00:00 2001 From: Vitaliy Ivanov Date: Thu, 7 Jul 2011 15:10:31 +0300 Subject: [PATCH] --- yaml --- r: 264812 b: refs/heads/master c: 7cfdaf38d4975b0266fbdef971e5ce37da7214fd h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/futex.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 18ad7ae18a10..5eb84d308ead 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 124ff4e53ace98300bf7465e0285167a3df838d3 +refs/heads/master: 7cfdaf38d4975b0266fbdef971e5ce37da7214fd diff --git a/trunk/kernel/futex.c b/trunk/kernel/futex.c index 0a308970c24a..f4e811c8623c 100644 --- a/trunk/kernel/futex.c +++ b/trunk/kernel/futex.c @@ -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 @@ 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))