diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-24 19:17:41 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-08-24 19:17:41 -0400 |
| commit | 7be141d0554921751db103b54e9f794956aa4f65 (patch) | |
| tree | b4355211d0000cfac547f1357104e62c96f3ac14 /drivers | |
| parent | 44744bb344abe032b387d361209038d2956e8c75 (diff) | |
| parent | 80b304fd00e8b667775ff791121b61ecd7cd0c03 (diff) | |
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 fixes from Ingo Molnar:
"A couple of EFI fixes, plus misc fixes all around the map"
* 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
efi/arm64: Store Runtime Services revision
firmware: Do not use WARN_ON(!spin_is_locked())
x86_32, entry: Clean up sysenter_badsys declaration
x86/doc: Fix the 'tlb_single_page_flush_ceiling' sysconfig path
x86/mm: Fix sparse 'tlb_single_page_flush_ceiling' warning and make the variable read-mostly
x86/mm: Fix RCU splat from new TLB tracepoints
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/firmware/efi/vars.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/firmware/efi/vars.c b/drivers/firmware/efi/vars.c index f0a43646a2f3..5abe943e3404 100644 --- a/drivers/firmware/efi/vars.c +++ b/drivers/firmware/efi/vars.c | |||
| @@ -481,7 +481,7 @@ EXPORT_SYMBOL_GPL(efivar_entry_remove); | |||
| 481 | */ | 481 | */ |
| 482 | static void efivar_entry_list_del_unlock(struct efivar_entry *entry) | 482 | static void efivar_entry_list_del_unlock(struct efivar_entry *entry) |
| 483 | { | 483 | { |
| 484 | WARN_ON(!spin_is_locked(&__efivars->lock)); | 484 | lockdep_assert_held(&__efivars->lock); |
| 485 | 485 | ||
| 486 | list_del(&entry->list); | 486 | list_del(&entry->list); |
| 487 | spin_unlock_irq(&__efivars->lock); | 487 | spin_unlock_irq(&__efivars->lock); |
| @@ -507,7 +507,7 @@ int __efivar_entry_delete(struct efivar_entry *entry) | |||
| 507 | const struct efivar_operations *ops = __efivars->ops; | 507 | const struct efivar_operations *ops = __efivars->ops; |
| 508 | efi_status_t status; | 508 | efi_status_t status; |
| 509 | 509 | ||
| 510 | WARN_ON(!spin_is_locked(&__efivars->lock)); | 510 | lockdep_assert_held(&__efivars->lock); |
| 511 | 511 | ||
| 512 | status = ops->set_variable(entry->var.VariableName, | 512 | status = ops->set_variable(entry->var.VariableName, |
| 513 | &entry->var.VendorGuid, | 513 | &entry->var.VendorGuid, |
| @@ -667,7 +667,7 @@ struct efivar_entry *efivar_entry_find(efi_char16_t *name, efi_guid_t guid, | |||
| 667 | int strsize1, strsize2; | 667 | int strsize1, strsize2; |
| 668 | bool found = false; | 668 | bool found = false; |
| 669 | 669 | ||
| 670 | WARN_ON(!spin_is_locked(&__efivars->lock)); | 670 | lockdep_assert_held(&__efivars->lock); |
| 671 | 671 | ||
| 672 | list_for_each_entry_safe(entry, n, head, list) { | 672 | list_for_each_entry_safe(entry, n, head, list) { |
| 673 | strsize1 = ucs2_strsize(name, 1024); | 673 | strsize1 = ucs2_strsize(name, 1024); |
| @@ -739,7 +739,7 @@ int __efivar_entry_get(struct efivar_entry *entry, u32 *attributes, | |||
| 739 | const struct efivar_operations *ops = __efivars->ops; | 739 | const struct efivar_operations *ops = __efivars->ops; |
| 740 | efi_status_t status; | 740 | efi_status_t status; |
| 741 | 741 | ||
| 742 | WARN_ON(!spin_is_locked(&__efivars->lock)); | 742 | lockdep_assert_held(&__efivars->lock); |
| 743 | 743 | ||
| 744 | status = ops->get_variable(entry->var.VariableName, | 744 | status = ops->get_variable(entry->var.VariableName, |
| 745 | &entry->var.VendorGuid, | 745 | &entry->var.VendorGuid, |