diff options
| author | H. Peter Anvin <hpa@linux.intel.com> | 2009-04-01 17:21:56 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-04-06 09:30:27 +0200 |
| commit | b09d2501ed3d294619cbfbcf828ad39324d0e548 (patch) | |
| tree | 96878faeb21e84933cd52e446ac121887e9051fe | |
| parent | 9ab772cd535c4b256a577eae516f9c7462346b2d (diff) | |
| download | linux-b09d2501ed3d294619cbfbcf828ad39324d0e548.tar.gz linux-b09d2501ed3d294619cbfbcf828ad39324d0e548.tar.bz2 linux-b09d2501ed3d294619cbfbcf828ad39324d0e548.zip | |
mutex: drop "inline" from mutex_lock() inside kernel/mutex.c
Impact: build fix
mutex_lock() is was defined inline in kernel/mutex.c, but wasn't
declared so not in <linux/mutex.h>. This didn't cause a problem until
checkin 3a2d367d9aabac486ac4444c6c7ec7a1dab16267 added the
atomic_dec_and_mutex_lock() inline in between declaration and
definion.
This broke building with CONFIG_ALLOW_WARNINGS=n, e.g. make
allnoconfig.
Either from the source code nor the allnoconfig binary output I cannot
find any internal references to mutex_lock() in kernel/mutex.c, so
presumably this "inline" is now-useless legacy.
Cc: Eric Paris <eparis@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Orig-LKML-Reference: <tip-3a2d367d9aabac486ac4444c6c7ec7a1dab16267@git.kernel.org>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
| -rw-r--r-- | kernel/mutex.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/kernel/mutex.c b/kernel/mutex.c index 5d79781394a3..fd95eaa672e6 100644 --- a/kernel/mutex.c +++ b/kernel/mutex.c @@ -89,7 +89,7 @@ __mutex_lock_slowpath(atomic_t *lock_count); * * This function is similar to (but not equivalent to) down(). */ -void inline __sched mutex_lock(struct mutex *lock) +void __sched mutex_lock(struct mutex *lock) { might_sleep(); /* |