---

yaml --- r: 199238 b: refs/heads/master c: a643ce2 h: refs/heads/master v: v3
git-mirror · May 20, 2010 · e29e4e4 · e29e4e4
1 parent a701c1a
commit e29e4e4
Show file tree

Hide file tree

Showing 7 changed files with 704 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 15651291a2f8c11e7e6a42d8bfde7a213ff13262
+refs/heads/master: a643ce207f3e70030bdb431e2a363cc111a60c1a
diff --git a/trunk/drivers/acpi/Kconfig b/trunk/drivers/acpi/Kconfig
@@ -360,4 +360,6 @@ config ACPI_SBS
 	  To compile this driver as a module, choose M here:
 	  the modules will be called sbs and sbshc.
 
+source "drivers/acpi/apei/Kconfig"
+
 endif	# ACPI
diff --git a/trunk/drivers/acpi/Makefile b/trunk/drivers/acpi/Makefile
@@ -67,3 +67,5 @@ processor-y			+= processor_idle.o processor_thermal.o
 processor-$(CONFIG_CPU_FREQ)	+= processor_perflib.o
 
 obj-$(CONFIG_ACPI_PROCESSOR_AGGREGATOR) += acpi_pad.o
+
+obj-$(CONFIG_ACPI_APEI)		+= apei/
diff --git a/trunk/drivers/acpi/apei/Kconfig b/trunk/drivers/acpi/apei/Kconfig
@@ -0,0 +1,8 @@
+config ACPI_APEI
+	bool "ACPI Platform Error Interface (APEI)"
+	depends on X86
+	help
+	  APEI allows to report errors (for example from the chipset)
+	  to the operating system. This improves NMI handling
+	  especially. In addition it supports error serialization and
+	  error injection.
diff --git a/trunk/drivers/acpi/apei/Makefile b/trunk/drivers/acpi/apei/Makefile
@@ -0,0 +1,3 @@
+obj-$(CONFIG_ACPI_APEI)		+= apei.o
+
+apei-y := apei-base.o
Original file line number	Diff line number	Diff line change
Expand Up		@@ -67,3 +67,5 @@ processor-y += processor_idle.o processor_thermal.o
		processor-$(CONFIG_CPU_FREQ) += processor_perflib.o

		obj-$(CONFIG_ACPI_PROCESSOR_AGGREGATOR) += acpi_pad.o

		obj-$(CONFIG_ACPI_APEI) += apei/
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		obj-$(CONFIG_ACPI_APEI) += apei.o

		apei-y := apei-base.o