diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-30 19:01:52 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-06-30 19:01:52 -0700 |
| commit | 58580c86450bc09ff101f0d23fd8a162c146bc64 (patch) | |
| tree | 31f2c19c768c35d1f8268dea509e2fc688d0a50e /arch/ia64/kernel/salinfo.c | |
| parent | 6086071005674eb982d898c75269c931240154cf (diff) | |
| parent | fadfd2b6ba8838a6cc458dbae214993a177a3ee9 (diff) | |
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6
* 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/aegl/linux-2.6:
Add Fenghua Yu as temporary co-maintainer for ia64
[IA64] address compiler warnings perfmon.c/salinfo.c
[IA64] Remove unnecessary semicolons
[IA64] sprintf should not be used with same source & destination address
Diffstat (limited to 'arch/ia64/kernel/salinfo.c')
| -rw-r--r-- | arch/ia64/kernel/salinfo.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/kernel/salinfo.c b/arch/ia64/kernel/salinfo.c index 7053c55b764..e6676fca482 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); + (void)(down_trylock(&data->mutex) ?: 0); up(&data->mutex); } |