---

yaml --- r: 199247 b: refs/heads/master c: a08f82d h: refs/heads/master i: 199245: e6710c7 199243: 8cd4e6f 199239: b95a5b5 199231: 373274d v: v3
git-mirror · May 20, 2010 · 592f35b · 592f35b
1 parent 3bc7ad2
commit 592f35b
Show file tree

Hide file tree

Showing 5 changed files with 882 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: d334a49113a4a33109fd24e46073280ecd1bea0d
+refs/heads/master: a08f82d08053fb6e3aa3635c2c26456d96337c8b
diff --git a/trunk/Documentation/kernel-parameters.txt b/trunk/Documentation/kernel-parameters.txt
@@ -750,6 +750,10 @@ and is between 256 and 4096 characters. It is defined in the file
 			Default value is 0.
 			Value can be changed at runtime via /selinux/enforce.
 
+	erst_disable	[ACPI]
+			Disable Error Record Serialization Table (ERST)
+			support.
+
 	ether=		[HW,NET] Ethernet cards parameters
 			This option is obsoleted by the "netdev=" option, which
 			has equivalent usage. See its documentation for details.

diff --git a/trunk/drivers/acpi/apei/Makefile b/trunk/drivers/acpi/apei/Makefile
@@ -2,4 +2,4 @@ obj-$(CONFIG_ACPI_APEI)		+= apei.o
 obj-$(CONFIG_ACPI_APEI_GHES)	+= ghes.o
 obj-$(CONFIG_ACPI_APEI_EINJ)	+= einj.o
 
-apei-y := apei-base.o hest.o cper.o
+apei-y := apei-base.o hest.o cper.o erst.o