tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds 45314915 f281233d

+4 -2
unified split
+2 -1
kernel/futex.c
··· 2489 { 2490 struct robust_list_head __user *head = curr->robust_list; 2491 struct robust_list __user *entry, *next_entry, *pending; 2492 - unsigned int limit = ROBUST_LIST_LIMIT, pi, next_pi, pip; 2493 unsigned long futex_offset; 2494 int rc; 2495
··· 2489 { 2490 struct robust_list_head __user *head = curr->robust_list; 2491 struct robust_list __user *entry, *next_entry, *pending; 2492 + unsigned int limit = ROBUST_LIST_LIMIT, pi, pip; 2493 + unsigned int uninitialized_var(next_pi); 2494 unsigned long futex_offset; 2495 int rc; 2496
+2 -1
kernel/futex_compat.c
··· 49 { 50 struct compat_robust_list_head __user *head = curr->compat_robust_list; 51 struct robust_list __user *entry, *next_entry, *pending; 52 - unsigned int limit = ROBUST_LIST_LIMIT, pi, next_pi, pip; 53 compat_uptr_t uentry, next_uentry, upending; 54 compat_long_t futex_offset; 55 int rc;
··· 49 { 50 struct compat_robust_list_head __user *head = curr->compat_robust_list; 51 struct robust_list __user *entry, *next_entry, *pending; 52 + unsigned int limit = ROBUST_LIST_LIMIT, pi, pip; 53 + unsigned int uninitialized_var(next_pi); 54 compat_uptr_t uentry, next_uentry, upending; 55 compat_long_t futex_offset; 56 int rc;