Merge tag 'uninit-macro-v5.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / kernel / futex.c

diff --git a/kernel/futex.c b/kernel/futex.c
index 4616d4a..8340412 100644 (file)
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -1305,7 +1305,7 @@ static int lookup_pi_state(u32 __user *uaddr, u32 uval,
 static int lock_pi_update_atomic(u32 __user *uaddr, u32 uval, u32 newval)
 {
        int err;
-       u32 uninitialized_var(curval);
+       u32 curval;
 
        if (unlikely(should_fail_futex(true)))
                return -EFAULT;
@@ -1475,7 +1475,7 @@ static void mark_wake_futex(struct wake_q_head *wake_q, struct futex_q *q)
  */
 static int wake_futex_pi(u32 __user *uaddr, u32 uval, struct futex_pi_state *pi_state)
 {
-       u32 uninitialized_var(curval), newval;
+       u32 curval, newval;
        struct task_struct *new_owner;
        bool postunlock = false;
        DEFINE_WAKE_Q(wake_q);
@@ -2325,7 +2325,7 @@ static int fixup_pi_state_owner(u32 __user *uaddr, struct futex_q *q,
                                struct task_struct *argowner)
 {
        struct futex_pi_state *pi_state = q->pi_state;
-       u32 uval, uninitialized_var(curval), newval;
+       u32 uval, curval, newval;
        struct task_struct *oldowner, *newowner;
        u32 newtid;
        int ret, err = 0;
@@ -2942,7 +2942,7 @@ uaddr_faulted:
  */
 static int futex_unlock_pi(u32 __user *uaddr, unsigned int flags)
 {
-       u32 uninitialized_var(curval), uval, vpid = task_pid_vnr(current);
+       u32 curval, uval, vpid = task_pid_vnr(current);
        union futex_key key = FUTEX_KEY_INIT;
        struct futex_hash_bucket *hb;
        struct futex_q *top_waiter;
@@ -3417,7 +3417,7 @@ err_unlock:
 static int handle_futex_death(u32 __user *uaddr, struct task_struct *curr,
                              bool pi, bool pending_op)
 {
-       u32 uval, uninitialized_var(nval), mval;
+       u32 uval, nval, mval;
        int err;
 
        /* Futex address must be 32bit aligned */
@@ -3547,7 +3547,7 @@ static void exit_robust_list(struct task_struct *curr)
        struct robust_list_head __user *head = curr->robust_list;
        struct robust_list __user *entry, *next_entry, *pending;
        unsigned int limit = ROBUST_LIST_LIMIT, pi, pip;
-       unsigned int uninitialized_var(next_pi);
+       unsigned int next_pi;
        unsigned long futex_offset;
        int rc;
 
@@ -3847,7 +3847,7 @@ static void compat_exit_robust_list(struct task_struct *curr)
        struct compat_robust_list_head __user *head = curr->compat_robust_list;
        struct robust_list __user *entry, *next_entry, *pending;
        unsigned int limit = ROBUST_LIST_LIMIT, pi, pip;
-       unsigned int uninitialized_var(next_pi);
+       unsigned int next_pi;
        compat_uptr_t uentry, next_uentry, upending;
        compat_long_t futex_offset;
        int rc;