Merge branches 'acpi-bus', 'acpi-button', 'acpi-sysfs' and 'acpi-misc' (b65d5630) · Commits · 戴 / test

Documentation/admin-guide/kernel-parameters.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -113,7 +113,7 @@
		the GPE dispatcher.
		This facility can be used to prevent such uncontrolled
		GPE floodings.
		Format: <int>
		Format: <byte>

		acpi_no_auto_serialize [HW,ACPI]
		Disable auto-serialization of AML methods

+1 −1

Original line number	Diff line number	Diff line
		@@ -153,7 +153,7 @@ int acpi_bus_get_private_data(acpi_handle handle, void **data)
		{
		acpi_status status;

		if (!*data)
		if (!data)
		return -EINVAL;

		status = acpi_get_data(handle, acpi_bus_private_data_handler, data);

+13 −0

Original line number	Diff line number	Diff line
		@@ -77,6 +77,19 @@ MODULE_DEVICE_TABLE(acpi, button_device_ids);

		/* Please keep this list sorted alphabetically by vendor and model */
		static const struct dmi_system_id dmi_lid_quirks[] = {
		{
		/*
		* Acer Switch 10 SW5-012. _LID method messes with home and
		* power button GPIO IRQ settings causing an interrupt storm on
		* both GPIOs. This is unfixable without a DSDT override, so we
		* have to disable the lid-switch functionality altogether :\|
		*/
		.matches = {
		DMI_MATCH(DMI_SYS_VENDOR, "Acer"),
		DMI_MATCH(DMI_PRODUCT_NAME, "Aspire SW5-012"),
		},
		.driver_data = (void *)(long)ACPI_BUTTON_LID_INIT_DISABLED,
		},
		{
		/*
		* Asus T200TA, _LID keeps reporting closed after every second

+3 −3

Original line number	Diff line number	Diff line
		@@ -819,14 +819,14 @@ end:
		* interface:
		* echo unmask > /sys/firmware/acpi/interrupts/gpe00
		*/
		#define ACPI_MASKABLE_GPE_MAX 0xFF
		#define ACPI_MASKABLE_GPE_MAX 0x100
		static DECLARE_BITMAP(acpi_masked_gpes_map, ACPI_MASKABLE_GPE_MAX) __initdata;

		static int __init acpi_gpe_set_masked_gpes(char *val)
		{
		u8 gpe;

		if (kstrtou8(val, 0, &gpe) \|\| gpe > ACPI_MASKABLE_GPE_MAX)
		if (kstrtou8(val, 0, &gpe))
		return -EINVAL;
		set_bit(gpe, acpi_masked_gpes_map);

		@@ -838,7 +838,7 @@ void __init acpi_gpe_apply_masked_gpes(void)
		{
		acpi_handle handle;
		acpi_status status;
		u8 gpe;
		u16 gpe;

		for_each_set_bit(gpe, acpi_masked_gpes_map, ACPI_MASKABLE_GPE_MAX) {
		status = acpi_get_gpe_device(gpe, &handle);

+4 −4

File changed.

Contains only whitespace changes.