Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
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
+4
-4
+3
-3
drivers/acpi/scan.c
+3
-3
drivers/acpi/scan.c
···
2054
2054
2055
2055
static struct acpi_probe_entry *ape;
2056
2056
static int acpi_probe_count;
2057
-
static DEFINE_SPINLOCK(acpi_probe_lock);
2057
+
static DEFINE_MUTEX(acpi_probe_mutex);
2058
2058
2059
2059
static int __init acpi_match_madt(struct acpi_subtable_header *header,
2060
2060
const unsigned long end)
···
2073
2073
if (acpi_disabled)
2074
2074
return 0;
2075
2075
2076
-
spin_lock(&acpi_probe_lock);
2076
+
mutex_lock(&acpi_probe_mutex);
2077
2077
for (ape = ap_head; nr; ape++, nr--) {
2078
2078
if (ACPI_COMPARE_NAME(ACPI_SIG_MADT, ape->id)) {
2079
2079
acpi_probe_count = 0;
···
2086
2086
count++;
2087
2087
}
2088
2088
}
2089
-
spin_unlock(&acpi_probe_lock);
2089
+
mutex_unlock(&acpi_probe_mutex);
2090
2090
2091
2091
return count;
2092
2092
}
+1
-1
include/linux/acpi.h
+1
-1
include/linux/acpi.h
···
1056
1056
return NULL;
1057
1057
}
1058
1058
1059
-
#define ACPI_DECLARE_PROBE_ENTRY(table, name, table_id, subtable, validate, data, fn) \
1059
+
#define ACPI_DECLARE_PROBE_ENTRY(table, name, table_id, subtable, valid, data, fn) \
1060
1060
static const void * __acpi_table_##name[] \
1061
1061
__attribute__((unused)) \
1062
1062
= { (void *) table_id, \