summaryrefslogtreecommitdiffstats
path: root/config-x86-generic
diff options
context:
space:
mode:
authorJosh Boyer <jwboyer@redhat.com>2011-08-04 09:55:54 -0400
committerJosh Boyer <jwboyer@redhat.com>2011-08-04 11:12:43 -0400
commit8e3ae989b3feba97db709d667ae39fbe2c7ace31 (patch)
treea04dcb7ae27ecf3a0c4620f82c72c3e71641d0e7 /config-x86-generic
parent1aa2339b01b1e13a2a4f660e54656ab0df1ecfb5 (diff)
downloadkernel-8e3ae989b3feba97db709d667ae39fbe2c7ace31.tar.gz
kernel-8e3ae989b3feba97db709d667ae39fbe2c7ace31.tar.xz
kernel-8e3ae989b3feba97db709d667ae39fbe2c7ace31.zip
3.0-git19 snapshot
Add epoll patch until it gets upstreamed Add trial patch to fix the scheduling while atomic issues around pidmap_init
Diffstat (limited to 'config-x86-generic')
-rw-r--r--config-x86-generic3
1 files changed, 2 insertions, 1 deletions
diff --git a/config-x86-generic b/config-x86-generic
index a4d47df80..5b03870e8 100644
--- a/config-x86-generic
+++ b/config-x86-generic
@@ -153,7 +153,8 @@ CONFIG_ACPI_PROCESSOR_AGGREGATOR=m
CONFIG_ACPI_HED=m
CONFIG_ACPI_APEI=y
CONFIG_ACPI_APEI_PCIEAER=y
-CONFIG_ACPI_APEI_GHES=m
+CONFIG_ACPI_APEI_GHES=y
+CONFIG_ACPI_APEI_MEMORY_FAILURE=y
# CONFIG_ACPI_APEI_EINJ is not set
CONFIG_ACPI_IPMI=m
CONFIG_ACPI_CUSTOM_METHOD=m