diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-13 16:08:05 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-06-13 16:08:05 +1000 |
| commit | 2870f66154a12ea2869ab8fd138d9fdb2655ca92 (patch) | |
| tree | 733df103d777e12d1cff413874756c127e4b81d7 /arch | |
| parent | 0e21a3562aec5758573c77d360bd8cd70f9096ec (diff) | |
| parent | 75f38eb4ffc0537ef3c6212920bc2b87a0f183d8 (diff) | |
Merge branch 'quilt/rr'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/ia64/kernel/salinfo.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/kernel/salinfo.c b/arch/ia64/kernel/salinfo.c index ecb9eb78d687..57c10efa161c 100644 --- a/arch/ia64/kernel/salinfo.c +++ b/arch/ia64/kernel/salinfo.c @@ -192,7 +192,7 @@ struct salinfo_platform_oemdata_parms { 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, char __user *buffer, size_t count, loff_t 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)) |