lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branches 'apei', 'bz-13195' and 'doc' into acpi

Browse Source
This commit is contained in:
Len Brown
2011-09-12 20:00:00 -04:00
parent b6fd41e29d 03ba176a29 b33c25d6a6 96242116d4
commit 38c0a0c9ae
4 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Documentation/kernel-parameters.txt
View File

@@ -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 }

2
drivers/acpi/acpica/acconfig.h
View File

@@ -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 */
/****************************************************************************** /******************************************************************************
* *

1
drivers/acpi/apei/Kconfig
View File

@@ -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

2
drivers/acpi/apei/apei-base.c
View File

@@ -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))