* [PATCH v2] firmware: Do not use WARN_ON(!spin_is_locked())
@ 2014-08-13 18:21 Guenter Roeck
2014-08-14 8:54 ` Matt Fleming
0 siblings, 1 reply; 2+ messages in thread
From: Guenter Roeck @ 2014-08-13 18:21 UTC (permalink / raw)
To: linux-efi; +Cc: linux-kernel, Guenter Roeck, Matt Fleming
spin_is_locked() always returns false for uniprocessor configurations
in several architectures, so do not use WARN_ON with it.
Use lockdep_assert_held() instead to also reduce overhead in
non-debug kernels.
Cc: Matt Fleming <matt.fleming@intel.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
v2: Use lockdep_assert_held instead of WARN_ON_SMP.
drivers/firmware/efi/vars.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/drivers/firmware/efi/vars.c b/drivers/firmware/efi/vars.c
index f0a4364..5abe943 100644
--- a/drivers/firmware/efi/vars.c
+++ b/drivers/firmware/efi/vars.c
@@ -481,7 +481,7 @@ EXPORT_SYMBOL_GPL(efivar_entry_remove);
*/
static void efivar_entry_list_del_unlock(struct efivar_entry *entry)
{
- WARN_ON(!spin_is_locked(&__efivars->lock));
+ lockdep_assert_held(&__efivars->lock);
list_del(&entry->list);
spin_unlock_irq(&__efivars->lock);
@@ -507,7 +507,7 @@ int __efivar_entry_delete(struct efivar_entry *entry)
const struct efivar_operations *ops = __efivars->ops;
efi_status_t status;
- WARN_ON(!spin_is_locked(&__efivars->lock));
+ lockdep_assert_held(&__efivars->lock);
status = ops->set_variable(entry->var.VariableName,
&entry->var.VendorGuid,
@@ -667,7 +667,7 @@ struct efivar_entry *efivar_entry_find(efi_char16_t *name, efi_guid_t guid,
int strsize1, strsize2;
bool found = false;
- WARN_ON(!spin_is_locked(&__efivars->lock));
+ lockdep_assert_held(&__efivars->lock);
list_for_each_entry_safe(entry, n, head, list) {
strsize1 = ucs2_strsize(name, 1024);
@@ -739,7 +739,7 @@ int __efivar_entry_get(struct efivar_entry *entry, u32 *attributes,
const struct efivar_operations *ops = __efivars->ops;
efi_status_t status;
- WARN_ON(!spin_is_locked(&__efivars->lock));
+ lockdep_assert_held(&__efivars->lock);
status = ops->get_variable(entry->var.VariableName,
&entry->var.VendorGuid,
--
1.9.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] firmware: Do not use WARN_ON(!spin_is_locked())
2014-08-13 18:21 [PATCH v2] firmware: Do not use WARN_ON(!spin_is_locked()) Guenter Roeck
@ 2014-08-14 8:54 ` Matt Fleming
0 siblings, 0 replies; 2+ messages in thread
From: Matt Fleming @ 2014-08-14 8:54 UTC (permalink / raw)
To: Guenter Roeck; +Cc: linux-efi, linux-kernel, Matt Fleming
On Wed, 13 Aug, at 11:21:34AM, Guenter Roeck wrote:
> spin_is_locked() always returns false for uniprocessor configurations
> in several architectures, so do not use WARN_ON with it.
> Use lockdep_assert_held() instead to also reduce overhead in
> non-debug kernels.
>
> Cc: Matt Fleming <matt.fleming@intel.com>
> Signed-off-by: Guenter Roeck <linux@roeck-us.net>
> ---
> v2: Use lockdep_assert_held instead of WARN_ON_SMP.
>
> drivers/firmware/efi/vars.c | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
Thanks Guenter, applied!
--
Matt Fleming, Intel Open Source Technology Center
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-08-14 8:54 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-08-13 18:21 [PATCH v2] firmware: Do not use WARN_ON(!spin_is_locked()) Guenter Roeck
2014-08-14 8:54 ` Matt Fleming
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).