Commit 4c115e95 authored Nov 04, 2010 by Darren Hart Committed by Thomas Gleixner Nov 10, 2010

futex: Address compiler warnings in exit_robust_list



Since commit 1dcc41bb (futex: Change 3rd arg of fetch_robust_entry()
to unsigned int*) some gcc versions decided to emit the following
warning:

kernel/futex.c: In function ‘exit_robust_list’:
kernel/futex.c:2492: warning: ‘next_pi’ may be used uninitialized in this function

The commit did not introduce the warning as gcc should have warned
before that commit as well. It's just gcc being silly.

The code path really can't result in next_pi being unitialized (or
should not), but let's keep the build clean. Annotate next_pi as an
uninitialized_var.

[ tglx: Addressed the same issue in futex_compat.c and massaged the
  	changelog ]

Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Tested-by: Matt Fleming <matt@console-pimps.org>
Tested-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Eric Dumazet <eric.dumazet@gmail.com>
Cc: John Kacur <jkacur@redhat.com>
Cc: Ingo Molnar <mingo@elte.hu>
LKML-Reference: <1288897200-13008-1-git-send-email-dvhart@linux.intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>

parent 814ce252

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;

Admin message