From mboxrd@z Thu Jan  1 00:00:00 1970
From: Simon Horman <horms@verge.net.au>
Date: Sun, 03 Aug 2008 00:06:58 +0000
Subject: [patch] IA64: suppress return value of down_trylock() in
Message-Id: <20080803000654.GA30659@verge.net.au>
List-Id: <linux-ia64.vger.kernel.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: linux-ia64@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Tony Luck <tony.luck@intel.com>, Keith Owens <kaos@ocs.com.au>

salinfo_work_to_do() intentionally ignores the return value of
down_trylock() and calls up() regardless of if the lock
was taken or not.

This patch suppresses the warning generated by ignoring
this return value - down_trylock() is annotated with __must_check.

(void)down_trylock() was not sufficient.

arch/ia64/kernel/salinfo.c: In function `salinfo_work_to_do':
arch/ia64/kernel/salinfo.c:195: warning: ignoring return value of `down_trylock'

# ia64-unknown-linux-gnu-gcc --version
ia64-unknown-linux-gnu-gcc (GCC) 3.4.5
Copyright (C) 2004 Free Software Foundation, Inc.
This is free software; see the source for copying conditions.  There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

Signed-off-by: Simon Horman <horms@verge.net.au>

Index: linux-2.6/arch/ia64/kernel/salinfo.c
=================================--- linux-2.6.orig/arch/ia64/kernel/salinfo.c	2008-08-03 09:52:08.000000000 +1000
+++ linux-2.6/arch/ia64/kernel/salinfo.c	2008-08-03 10:03:36.000000000 +1000
@@ -192,7 +192,7 @@ struct salinfo_platform_oemdata_parms {
 static void
 salinfo_work_to_do(struct salinfo_data *data)
 {
-	down_trylock(&data->mutex);
+	if (down_trylock(&data->mutex)) { ; }; /* Ignore return value */
 	up(&data->mutex);
 }