Signed-off-by: Jan Beulich <jbeulich@xxxxxxxxxx>
---
arch/ia64/kernel/perfmon.c | 2 +-
arch/ia64/kernel/salinfo.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- linux-2.6.31-rc1/arch/ia64/kernel/perfmon.c 2009-06-30 11:27:04.000000000 +0200
+++ 2.6.31-rc1-ia64-warnings/arch/ia64/kernel/perfmon.c 2009-06-23 14:06:50.000000000 +0200
@@ -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)
--- linux-2.6.31-rc1/arch/ia64/kernel/salinfo.c 2009-06-10 05:05:27.000000000 +0200
+++ 2.6.31-rc1-ia64-warnings/arch/ia64/kernel/salinfo.c 2009-06-30 12:10:55.000000000 +0200
@@ -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);
}
--
To unsubscribe from this list: send the line "unsubscribe linux-ia64" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|