down_trylock -> down_try in arch/ia64/kernel/salinfo.c Signed-off-by: Rusty Russell --- arch/ia64/kernel/salinfo.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff -r 99959fd25ab8 arch/ia64/kernel/salinfo.c --- a/arch/ia64/kernel/salinfo.c Tue May 06 10:17:33 2008 +1000 +++ b/arch/ia64/kernel/salinfo.c Tue May 06 10:31:01 2008 +1000 @@ -192,7 +192,7 @@ static void static void salinfo_work_to_do(struct salinfo_data *data) { - down_trylock(&data->mutex); + down_try(&data->mutex); up(&data->mutex); } @@ -309,7 +309,7 @@ salinfo_event_read(struct file *file, ch int i, n, cpu = -1; retry: - if (cpus_empty(data->cpu_event) && down_trylock(&data->mutex)) { + if (cpus_empty(data->cpu_event) && !down_try(&data->mutex)) { if (file->f_flags & O_NONBLOCK) return -EAGAIN; if (down_interruptible(&data->mutex))