diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-16 23:31:03 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-11-16 23:31:03 +0100 |
| commit | 45314915ed8089634144c975357bf5ba17f06ab9 (patch) | |
| tree | 6b7db771ee69fff267b781faaab388be162df843 /kernel | |
| parent | SCSI host lock push-down (diff) | |
| parent | futex: Address compiler warnings in exit_robust_list (diff) | |
| download | linux-45314915ed8089634144c975357bf5ba17f06ab9.tar.xz linux-45314915ed8089634144c975357bf5ba17f06ab9.zip | |
Merge branch 'futexes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'futexes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip:
futex: Address compiler warnings in exit_robust_list
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/futex.c | 3 | ||||
| -rw-r--r-- | kernel/futex_compat.c | 3 |
2 files changed, 4 insertions, 2 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; diff --git a/kernel/futex_compat.c b/kernel/futex_compat.c index 06da4dfc339b..a7934ac75e5b 100644 --- a/kernel/futex_compat.c +++ b/kernel/futex_compat.c @@ -49,7 +49,8 @@ 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, next_pi, pip; + unsigned int limit = ROBUST_LIST_LIMIT, pi, pip; + unsigned int uninitialized_var(next_pi); compat_uptr_t uentry, next_uentry, upending; compat_long_t futex_offset; int rc; |