---

yaml
---
r: 209519
b: refs/heads/master
c: a25ee92
h: refs/heads/master
i:
  209517: 5a7274f
  209515: a6dff08
  209511: b023f8c
  209503: 8ceb924
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: feb29c5175e61d0f1ec2cbcaccdfa55e588780be
+refs/heads/master: a25ee9200eef07377e1703697afbb5d81f89e500

trunk/arch/x86/kernel/cpu/mcheck/mce-apei.c

@@ -80,7 +80,7 @@ int apei_write_mce(struct mce *m)
 	rcd.hdr.revision = CPER_RECORD_REV;
 	rcd.hdr.signature_end = CPER_SIG_END;
 	rcd.hdr.section_count = 1;
-	rcd.hdr.error_severity = CPER_SEV_FATAL;
+	rcd.hdr.error_severity = CPER_SER_FATAL;
 	/* timestamp, platform_id, partition_id are all invalid */
 	rcd.hdr.validation_bits = 0;
 	rcd.hdr.record_length = sizeof(rcd);
@@ -96,7 +96,7 @@ int apei_write_mce(struct mce *m)
 	rcd.sec_hdr.validation_bits = 0;
 	rcd.sec_hdr.flags = CPER_SEC_PRIMARY;
 	rcd.sec_hdr.section_type = CPER_SECTION_TYPE_MCE;
-	rcd.sec_hdr.section_severity = CPER_SEV_FATAL;
+	rcd.sec_hdr.section_severity = CPER_SER_FATAL;
 
 	memcpy(&rcd.mce, m, sizeof(*m));
 

trunk/drivers/acpi/Makefile

@@ -39,6 +39,7 @@ acpi-y				+= pci_root.o pci_link.o pci_irq.o pci_bind.o
 acpi-y				+= power.o
 acpi-y				+= system.o event.o
 acpi-$(CONFIG_ACPI_DEBUG)	+= debug.o
+acpi-$(CONFIG_DEBUG_FS)		+= debugfs.o
 acpi-$(CONFIG_ACPI_NUMA)	+= numa.o
 acpi-$(CONFIG_ACPI_PROCFS_POWER) += cm_sbs.o
 ifdef CONFIG_ACPI_VIDEO

trunk/drivers/acpi/apei/Kconfig

@@ -28,12 +28,3 @@ config ACPI_APEI_EINJ
 	  EINJ provides a hardware error injection mechanism, it is
 	  mainly used for debugging and testing the other parts of
 	  APEI and some other RAS features.
-
-config ACPI_APEI_ERST_DEBUG
-	tristate "APEI Error Record Serialization Table (ERST) Debug Support"
-	depends on ACPI_APEI
-	help
-	  ERST is a way provided by APEI to save and retrieve hardware
-	  error infomation to and from a persistent store. Enable this
-	  if you want to debugging and testing the ERST kernel support
-	  and firmware implementation.

trunk/drivers/acpi/apei/Makefile

@@ -1,6 +1,5 @@
 obj-$(CONFIG_ACPI_APEI)		+= apei.o
 obj-$(CONFIG_ACPI_APEI_GHES)	+= ghes.o
 obj-$(CONFIG_ACPI_APEI_EINJ)	+= einj.o
-obj-$(CONFIG_ACPI_APEI_ERST_DEBUG) += erst-dbg.o
 
 apei-y := apei-base.o hest.o cper.o erst.o

trunk/drivers/acpi/apei/apei-base.c

@@ -482,14 +482,14 @@ int apei_resources_request(struct apei_resources *resources,
 	list_for_each_entry(res, &resources->ioport, list) {
 		if (res == res_bak)
 			break;
-		release_region(res->start, res->end - res->start);
+		release_mem_region(res->start, res->end - res->start);
 	}
 	res_bak = NULL;
 err_unmap_iomem:
 	list_for_each_entry(res, &resources->iomem, list) {
 		if (res == res_bak)
 			break;
-		release_mem_region(res->start, res->end - res->start);
+		release_region(res->start, res->end - res->start);
 	}
 	return -EINVAL;
 }