apfs/linux-apfs
0
0
Fork 0
mirror of https://github.com/linux-apfs/linux-apfs.git synced 2026-05-01 15:00:59 -07:00
Code Issues Packages Projects 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
drivers/acpi/acpica/acconfig.h
+1 -1
View File
@@ -121,7 +121,7 @@
/* 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
View File
@@ -13,6 +13,7 @@ config ACPI_APEI_GHES
bool "APEI Generic Hardware Error Source"
depends on ACPI_APEI && X86
select ACPI_HED
select IRQ_WORK
select LLIST
select GENERIC_ALLOCATOR
help
drivers/acpi/apei/apei-base.c
+1 -1
View File
@@ -618,7 +618,7 @@ int apei_osc_setup(void)
};
capbuf[OSC_QUERY_TYPE] = OSC_QUERY_ENABLE;
capbuf[OSC_SUPPORT_TYPE] = 0;
capbuf[OSC_SUPPORT_TYPE] = 1;
capbuf[OSC_CONTROL_TYPE] = 0;
if (ACPI_FAILURE(acpi_get_handle(NULL, "\\_SB", &handle))