projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'for-4.9/dax' into libnvdimm-for-next
[cascardo/linux.git]
/
drivers
/
acpi
/
scan.c
diff --git
a/drivers/acpi/scan.c
b/drivers/acpi/scan.c
index
ad9fc84
..
e878fc7
100644
(file)
--- a/
drivers/acpi/scan.c
+++ b/
drivers/acpi/scan.c
@@
-2054,7
+2054,7
@@
int __init acpi_scan_init(void)
static struct acpi_probe_entry *ape;
static int acpi_probe_count;
static struct acpi_probe_entry *ape;
static int acpi_probe_count;
-static DEFINE_
SPINLOCK(acpi_probe_lock
);
+static DEFINE_
MUTEX(acpi_probe_mutex
);
static int __init acpi_match_madt(struct acpi_subtable_header *header,
const unsigned long end)
static int __init acpi_match_madt(struct acpi_subtable_header *header,
const unsigned long end)
@@
-2073,7
+2073,7
@@
int __init __acpi_probe_device_table(struct acpi_probe_entry *ap_head, int nr)
if (acpi_disabled)
return 0;
if (acpi_disabled)
return 0;
-
spin_lock(&acpi_probe_lock
);
+
mutex_lock(&acpi_probe_mutex
);
for (ape = ap_head; nr; ape++, nr--) {
if (ACPI_COMPARE_NAME(ACPI_SIG_MADT, ape->id)) {
acpi_probe_count = 0;
for (ape = ap_head; nr; ape++, nr--) {
if (ACPI_COMPARE_NAME(ACPI_SIG_MADT, ape->id)) {
acpi_probe_count = 0;
@@
-2086,7
+2086,7
@@
int __init __acpi_probe_device_table(struct acpi_probe_entry *ap_head, int nr)
count++;
}
}
count++;
}
}
-
spin_unlock(&acpi_probe_lock
);
+
mutex_unlock(&acpi_probe_mutex
);
return count;
}
return count;
}