diff options
Diffstat (limited to 'drivers/acpi/scan.c')
| -rw-r--r-- | drivers/acpi/scan.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/acpi/scan.c b/drivers/acpi/scan.c index ad9fc84a8601..e878fc799af7 100644 --- a/drivers/acpi/scan.c +++ b/drivers/acpi/scan.c | |||
| @@ -2054,7 +2054,7 @@ int __init acpi_scan_init(void) | |||
| 2054 | 2054 | ||
| 2055 | static struct acpi_probe_entry *ape; | 2055 | static struct acpi_probe_entry *ape; |
| 2056 | static int acpi_probe_count; | 2056 | static int acpi_probe_count; |
| 2057 | static DEFINE_SPINLOCK(acpi_probe_lock); | 2057 | static DEFINE_MUTEX(acpi_probe_mutex); |
| 2058 | 2058 | ||
| 2059 | static int __init acpi_match_madt(struct acpi_subtable_header *header, | 2059 | static int __init acpi_match_madt(struct acpi_subtable_header *header, |
| 2060 | const unsigned long end) | 2060 | const unsigned long end) |
| @@ -2073,7 +2073,7 @@ int __init __acpi_probe_device_table(struct acpi_probe_entry *ap_head, int nr) | |||
| 2073 | if (acpi_disabled) | 2073 | if (acpi_disabled) |
| 2074 | return 0; | 2074 | return 0; |
| 2075 | 2075 | ||
| 2076 | spin_lock(&acpi_probe_lock); | 2076 | mutex_lock(&acpi_probe_mutex); |
| 2077 | for (ape = ap_head; nr; ape++, nr--) { | 2077 | for (ape = ap_head; nr; ape++, nr--) { |
| 2078 | if (ACPI_COMPARE_NAME(ACPI_SIG_MADT, ape->id)) { | 2078 | if (ACPI_COMPARE_NAME(ACPI_SIG_MADT, ape->id)) { |
| 2079 | acpi_probe_count = 0; | 2079 | acpi_probe_count = 0; |
| @@ -2086,7 +2086,7 @@ int __init __acpi_probe_device_table(struct acpi_probe_entry *ap_head, int nr) | |||
| 2086 | count++; | 2086 | count++; |
| 2087 | } | 2087 | } |
| 2088 | } | 2088 | } |
| 2089 | spin_unlock(&acpi_probe_lock); | 2089 | mutex_unlock(&acpi_probe_mutex); |
| 2090 | 2090 | ||
| 2091 | return count; | 2091 | return count; |
| 2092 | } | 2092 | } |
