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

Commit 770b782f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'acpi-4.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull ACPI fix from Rafael Wysocki:
 "This fixes an APEI problem that may cause a reported error to be
  missed due to a race condition"

* tag 'acpi-4.14-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  ACPI / APEI: clear error status before acknowledging the error
parents 74de8187 333d1774

drivers/acpi/apei/ghes.c

+9 −7
Original line number Diff line number Diff line
@@ -743,17 +743,19 @@ static int ghes_proc(struct ghes *ghes) 
	}

	ghes_do_proc(ghes, ghes->estatus);



out:

	ghes_clear_estatus(ghes);



	if (rc == -ENOENT)

		return rc;



	/*

	 * GHESv2 type HEST entries introduce support for error acknowledgment,

	 * so only acknowledge the error if this support is present.

	 */

	if (is_hest_type_generic_v2(ghes)) {

		rc = ghes_ack_error(ghes->generic_v2);

		if (rc)

			return rc;

	}

out:

	ghes_clear_estatus(ghes);

	if (is_hest_type_generic_v2(ghes))

		return ghes_ack_error(ghes->generic_v2);



	return rc;

}