From: Johannes Berg <johannes.berg@intel.com>
Date: Fri, 6 Aug 2010 14:17:53 +0000 (+0200)
Subject: iwlwifi: fix locking assertions
X-Git-Tag: v2.6.36-rc1~305^2~11^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a24d52f390a77ce90dc8cf0cd75d27ec0a6ea3f8;p=pandora-kernel.git

iwlwifi: fix locking assertions

spin_is_locked() can return zero on some (UP?)
configurations because locks don't exist, and
that causes an endless amount of warnings. Use
lockdep_assert_held() instead, which has two
advantages:
 1) it verifies the current task is holding
    the lock or mutex
 2) it compiles away completely when lockdep
    is not enabled

Cc: stable@kernel.org [2.6.34+, maybe only parts of patch]
Reported-by: Thomas Meyer <thomas@m3y3r.de>
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
---

Reading git-diff-tree failed