Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 139353ff authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'please-pull-einj-fix-for-acpi5' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras 

Pull ACPI5 error injection fix from Tony Luck:
 "Trivial fix for error injection code using ACPI5 version of EINJ"

* tag 'please-pull-einj-fix-for-acpi5' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras:
  ACPI, APEI, EINJ: Add missed ACPI5 support for error trigger table
parents 251a8cfe 112f1fc0

drivers/acpi/apei/einj.c

+1 −1
Original line number Diff line number Diff line
@@ -367,7 +367,7 @@ static int __einj_error_trigger(u64 trigger_paddr, u32 type, 
	 * This will cause resource conflict with regular memory.  So

	 * remove it from trigger table resources.

	 */

	if (param_extension && (type & 0x0038) && param2) {

	if ((param_extension || acpi5) && (type & 0x0038) && param2) {

		struct apei_resources addr_resources;

		apei_resources_init(&addr_resources);

		trigger_param_region = einj_get_trigger_parameter_region(