Commit 45314915 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents f281233d 4c115e95

kernel/futex.c

+2 −1
Original line number Diff line number Diff line
@@ -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;

kernel/futex_compat.c

+2 −1
Original line number Diff line number Diff line
@@ -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;