Commit 2f4d3218 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'acpi' of git://github.com/lenb/linux 

* 'acpi' of git://github.com/lenb/linux:
  acpica: ACPI_MAX_SLEEP should be 2 sec, not 20
  ACPI APEI: Add Kconfig option IRQ_WORK for GHES
  PNP: update pnp.debug usage (needs value on command line)
  APEI: Fix WHEA _OSC call
parents d9543314 38c0a0c9

Documentation/kernel-parameters.txt

+6 −3
Original line number Original line Diff line number Diff line
@@ -2086,9 +2086,12 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
			Override pmtimer IOPort with a hex value.

			Override pmtimer IOPort with a hex value.

			e.g. pmtmr=0x508

			e.g. pmtmr=0x508





	pnp.debug	[PNP]

	pnp.debug=1	[PNP]

			Enable PNP debug messages.  This depends on the

			Enable PNP debug messages (depends on the

			CONFIG_PNP_DEBUG_MESSAGES option.

			CONFIG_PNP_DEBUG_MESSAGES option).  Change at run-time

			via /sys/module/pnp/parameters/debug.  We always show

			current resource usage; turning this on also shows

			possible settings and some assignment information.





	pnpacpi=	[ACPI]

	pnpacpi=	[ACPI]

			{ off }

			{ off }

drivers/acpi/acpica/acconfig.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -121,7 +121,7 @@ 




/* Maximum sleep allowed via Sleep() operator */

/* Maximum sleep allowed via Sleep() operator */





#define ACPI_MAX_SLEEP                  20000	/* Two seconds */

#define ACPI_MAX_SLEEP                  2000	/* Two seconds */





/******************************************************************************

/******************************************************************************

 *

 *

drivers/acpi/apei/Kconfig

+1 −0
Original line number Original line Diff line number Diff line
@@ -13,6 +13,7 @@ config ACPI_APEI_GHES 
	bool "APEI Generic Hardware Error Source"

	bool "APEI Generic Hardware Error Source"

	depends on ACPI_APEI && X86

	depends on ACPI_APEI && X86

	select ACPI_HED

	select ACPI_HED

	select IRQ_WORK

	select LLIST

	select LLIST

	select GENERIC_ALLOCATOR

	select GENERIC_ALLOCATOR

	help

	help

drivers/acpi/apei/apei-base.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -618,7 +618,7 @@ int apei_osc_setup(void) 
	};

	};





	capbuf[OSC_QUERY_TYPE] = OSC_QUERY_ENABLE;

	capbuf[OSC_QUERY_TYPE] = OSC_QUERY_ENABLE;

	capbuf[OSC_SUPPORT_TYPE] = 0;

	capbuf[OSC_SUPPORT_TYPE] = 1;

	capbuf[OSC_CONTROL_TYPE] = 0;

	capbuf[OSC_CONTROL_TYPE] = 0;





	if (ACPI_FAILURE(acpi_get_handle(NULL, "\\_SB", &handle))

	if (ACPI_FAILURE(acpi_get_handle(NULL, "\\_SB", &handle))

CRA Git | Maintained and supported by SUSTech CRA and CCSE