[tip:core/locking] kernel/mutex.c: Fix unused var warning
in [Kernel]
|
Prev: core/locking changes for v2.6.35
Next: [GIT PULL] first round of SCSI updates for the 2.6.35 merge window
From: tip-bot for Andrew Morton on 18 May 2010 10:50 Commit-ID: 0f14452563e342637f9a3a2f036cac7315081b2b Gitweb: http://git.kernel.org/tip/0f14452563e342637f9a3a2f036cac7315081b2b Author: Andrew Morton <akpm(a)linux-foundation.org> AuthorDate: Fri, 14 May 2010 11:13:48 -0700 Committer: Ingo Molnar <mingo(a)elte.hu> CommitDate: Tue, 18 May 2010 16:46:03 +0200 kernel/mutex.c: Fix unused var warning kernel/mutex.c: In function '__mutex_lock_common': kernel/mutex.c:148: warning: unused variable 'timeout' Cc: Linus Torvalds <torvalds(a)linux-foundation.org> Cc: Benjamin Herrenschmidt <benh(a)kernel.crashing.org> Cc: Peter Zijlstra <a.p.zijlstra(a)chello.nl> Cc: <stable(a)kernel.org> Signed-off-by: Andrew Morton <akpm(a)linux-foundation.org> LKML-Reference: <201005141841.o4EIfcl0015387(a)imap1.linux-foundation.org> Signed-off-by: Ingo Molnar <mingo(a)elte.hu> --- kernel/mutex.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/kernel/mutex.c b/kernel/mutex.c index 7d4626b..b998c6e 100644 --- a/kernel/mutex.c +++ b/kernel/mutex.c @@ -145,7 +145,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass, struct task_struct *task = current; struct mutex_waiter waiter; unsigned long flags; - unsigned long timeout; + unsigned long timeout __maybe_unused; preempt_disable(); mutex_acquire(&lock->dep_map, subclass, 0, ip); -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |