Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fa276f36 authored by Jan Beulich's avatar Jan Beulich Committed by Tony Luck
Browse files

[IA64] address compiler warnings perfmon.c/salinfo.c



perfmon.c has a dubious cast directly from "int" to "void *". Add
an intermediate cast to "long" to keep gcc happy.

salinfo.c uses "down_trylock()" in a highly creative way (explained
in the comments in the file) ... but it does kick out this warning:

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

which people occasionally try to "fix" in ways that do not work. Use some
casts to keep gcc quiet.

Signed-off-by: default avatarJan Beulich <jbeulich@novell.com>
Signed-off-by: default avatarTony Luck <tony.luck@intel.com>
parent 58782b34
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -5603,7 +5603,7 @@ pfm_interrupt_handler(int irq, void *arg)
 * /proc/perfmon interface, for debug only
 */

#define PFM_PROC_SHOW_HEADER	((void *)nr_cpu_ids+1)
#define PFM_PROC_SHOW_HEADER	((void *)(long)nr_cpu_ids+1)

static void *
pfm_proc_start(struct seq_file *m, loff_t *pos)
+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ struct salinfo_platform_oemdata_parms {
static void
salinfo_work_to_do(struct salinfo_data *data)
{
	down_trylock(&data->mutex);
	(void)(down_trylock(&data->mutex) ?: 0);
	up(&data->mutex);
}