Commit 0214da7c authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branches 'acpi-ec' and 'acpi-x86' 

* acpi-ec:
  ACPI: EC: Fix up fast path check in acpi_ec_add()

* acpi-x86:
  ACPI, x86/boot: make acpi_nobgrt static
parents 6de08480 d7e0481c b5432a69

arch/x86/kernel/acpi/boot.c

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ EXPORT_SYMBOL(acpi_disabled); 
#define PREFIX			"ACPI: "



int acpi_noirq;				/* skip ACPI IRQ initialization */

int acpi_nobgrt;			/* skip ACPI BGRT */

static int acpi_nobgrt;			/* skip ACPI BGRT */

int acpi_pci_disabled;		/* skip ACPI PCI scan and IRQ initialization */

EXPORT_SYMBOL(acpi_pci_disabled);

drivers/acpi/ec.c

+2 −2
Original line number Diff line number Diff line
@@ -1589,8 +1589,8 @@ static int acpi_ec_add(struct acpi_device *device) 
	strcpy(acpi_device_name(device), ACPI_EC_DEVICE_NAME);

	strcpy(acpi_device_class(device), ACPI_EC_CLASS);



	if ((boot_ec && boot_ec->handle == device->handle) ||

	    !strcmp(acpi_device_hid(device), ACPI_ECDT_HID)) {

	if (boot_ec && (boot_ec->handle == device->handle ||

	    !strcmp(acpi_device_hid(device), ACPI_ECDT_HID))) {

		/* Fast path: this device corresponds to the boot EC. */

		ec = boot_ec;

	} else {