diff options
| author | sruffell <sruffell@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2009-01-05 22:31:40 +0000 |
|---|---|---|
| committer | sruffell <sruffell@5390a7c7-147a-4af0-8ec9-7488f05a26cb> | 2009-01-05 22:31:40 +0000 |
| commit | bc2de4c33ac2b927f6f8450c37ff731eb258f5e8 (patch) | |
| tree | f9c62ef94d10078de14c99f4742247ba77d1aece | |
| parent | fb28ed9ed847fa846b539db8a37e6e99d06bf0a7 (diff) | |
spin_is_lock always evalulates to 0 on SMP kernels. So since I still want to
keep the check in there to avoid problems in the future (and since this code
path is only used when opening a new transcoder session) I made the check
conditional on running an SMP kernel.
git-svn-id: http://svn.digium.com/svn/zaptel/branches/1.4@4607 5390a7c7-147a-4af0-8ec9-7488f05a26cb
| -rw-r--r-- | kernel/zttranscode.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/kernel/zttranscode.c b/kernel/zttranscode.c index 70ba2e1..1defc51 100644 --- a/kernel/zttranscode.c +++ b/kernel/zttranscode.c @@ -183,8 +183,10 @@ get_free_channel(struct zt_transcoder *tc, const struct zt_transcoder_formats *f { struct zt_transcoder_channel *chan; int i; +#ifdef CONFIG_SMP /* Should be called with the translock held. */ WARN_ON(!spin_is_locked(&translock)); +#endif for (i = 0; i < tc->numchannels; i++) { chan = &tc->channels[i]; |