Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 601b5869 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 9a0bcc8f 5331d9ca

drivers/acpi/scan.c

+3 −3
Original line number Diff line number Diff line
@@ -2054,7 +2054,7 @@ int __init acpi_scan_init(void) 


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)
@@ -2073,7 +2073,7 @@ int __init __acpi_probe_device_table(struct acpi_probe_entry *ap_head, int nr) 
	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;
@@ -2086,7 +2086,7 @@ int __init __acpi_probe_device_table(struct acpi_probe_entry *ap_head, int nr) 
				count++;

		}

	}

	spin_unlock(&acpi_probe_lock);

	mutex_unlock(&acpi_probe_mutex);



	return count;

}

include/linux/acpi.h

+1 −1
Original line number Diff line number Diff line
@@ -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,					\