diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-09-02 15:16:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2016-09-02 15:16:04 -0700 |
| commit | 601b58699440b421756e5a2b8f3f2211879dd94d (patch) | |
| tree | 2ab7cb1650bd605367d62a9587aac13017b51bfd /include | |
| parent | 9a0bcc8fe701bb6e05e622c19b5815e949c9b7c5 (diff) | |
| parent | 5331d9cab32ef640b4cd38a43b0858874fbb7168 (diff) | |
| download | linux-601b58699440b421756e5a2b8f3f2211879dd94d.tar.gz linux-601b58699440b421756e5a2b8f3f2211879dd94d.tar.bz2 linux-601b58699440b421756e5a2b8f3f2211879dd94d.zip | |
Merge tag 'acpi-4.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm
Pull ACPI fixes ffrom Rafael Wysocki:
"Two stable-candidate fixes for the ACPI early device probing code
added during the 4.4 cycle, one fixing a typo in a stub macro used
when CONFIG_ACPI is unset and one that prevents sleeping functions
from being called under a spinlock (Lorenzo Pieralisi)"
* tag 'acpi-4.8-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
ACPI / drivers: replace acpi_probe_lock spinlock with mutex
ACPI / drivers: fix typo in ACPI_DECLARE_PROBE_ENTRY macro
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/acpi.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/acpi.h b/include/linux/acpi.h index 4d8452c2384b..c5eaf2f80a4c 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -1056,7 +1056,7 @@ static inline struct fwnode_handle *acpi_get_next_subnode(struct device *dev, return NULL; } -#define ACPI_DECLARE_PROBE_ENTRY(table, name, table_id, subtable, validate, data, fn) \ +#define ACPI_DECLARE_PROBE_ENTRY(table, name, table_id, subtable, valid, data, fn) \ static const void * __acpi_table_##name[] \ __attribute__((unused)) \ = { (void *) table_id, \ |