projects
/
GitHub
/
mt8127
/
android_kernel_alcatel_ttab.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'v3.10.55' into update
[GitHub/mt8127/android_kernel_alcatel_ttab.git]
/
drivers
/
firmware
/
efi
/
vars.c
diff --git
a/drivers/firmware/efi/vars.c
b/drivers/firmware/efi/vars.c
index 391c67b182d9b282681890cd04b98c0183023abc..7dbc319e1cf539f46f84da62b1b1d64375f2f821 100644
(file)
--- 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)
{
*/
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);
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;
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,
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;
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);
list_for_each_entry_safe(entry, n, head, list) {
strsize1 = ucs2_strsize(name, 1024);
@@
-731,7
+731,7
@@
int __efivar_entry_get(struct efivar_entry *entry, u32 *attributes,
const struct efivar_operations *ops = __efivars->ops;
efi_status_t status;
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,
status = ops->get_variable(entry->var.VariableName,
&entry->var.VendorGuid,