diff options
author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-22 08:51:36 +0000 |
---|---|---|
committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-11-22 08:51:36 +0000 |
commit | e624ae8e0d4243e71daedce7570e91290438eaca (patch) | |
tree | e2b9804379a6aab3d2471898d257fe5590feb70c /kernel/futex.c | |
parent | drm/i915: Capture interesting display registers on error (diff) | |
parent | Merge remote branch 'linus' into drm-intel-fixes (diff) | |
download | linux-dev-e624ae8e0d4243e71daedce7570e91290438eaca.tar.xz linux-dev-e624ae8e0d4243e71daedce7570e91290438eaca.zip |
Merge branch 'drm-intel-fixes' into drm-intel-next
Conflicts:
drivers/gpu/drm/i915/i915_gem.c
Diffstat (limited to 'kernel/futex.c')
-rw-r--r-- | kernel/futex.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/futex.c b/kernel/futex.c index 6c683b37f2ce..40a8777a27d0 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -2489,7 +2489,8 @@ 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, next_pi, pip; + unsigned int limit = ROBUST_LIST_LIMIT, pi, pip; + unsigned int uninitialized_var(next_pi); unsigned long futex_offset; int rc; |