Trivial fix for error injection code using ACPI5 version of EINJ

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iQIcBAABAgAGBQJQxjlHAAoJEKurIx+X31iBcPsP/RvI5r742t1/gGdTrjE38D50
 6voh7q3n73c88xtWQxq0mQooxaSr/c89aVWzbC3e4MpM/UZvJTaFDRs6ylpjoPz1
 hw+qB6bETg3GhSomJm8dQGz8igr4jo6F2xEN7BaqVehk2r4yO48Zq3NLhlJJd/yV
 q1wkL0gOHZ61v3mGErjvcLkBCKZ1z+M1K++MH9uiKTYwnj/7+wUg7xxYAvoZPeBW
 z6kNN6zwT68ns0ams+ljNh78KWQz0m6YiZKlcqaXbbnvHR2mK+OXC3kz5dMB0Oqv
 pSEQSkUkYS/bxUd5OKjmxRLYHgE9rs71EyCuVDmWeJ3bivTHvLPb2udq4EBDv/YB
 +kTqdi4NHIorvzh7ywHrAkRfGxYjavQE7f67TSUqQIYDrkX7VSkL/kp6rZv0WGAN
 Oe+5vEXAu1dUSIlRLxGYF1Wvb7vDzS8O5WHkCFJsBVfxtEKiL6UAPRPRTLyoK9Zt
 joYQbK+kelejplZucGOU0AkJlY1Fj/6TapAaKCVwj+6gkSjEI7Y92R8QW82fZTM1
 QAaP3mvlZQoeIE3CW/lIvv4VVfiZA3eA1vSU1LPKVKHlm1Oywv/r+1PNPbYCgRvn
 iJEhFBQVZU4ZklViabcWIqiFCjaxdzjY1m/CfR9HsyymJm+kpcsnHdXxo3aPmQD5
 QBxLTqP20SEkXaICYQ7P
 =n2Kn
 -----END PGP SIGNATURE-----

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
This commit is contained in:
Linus Torvalds 2012-12-12 07:54:53 -08:00
Родитель 251a8cfeda 112f1fc08d
Коммит 139353ffbe
1 изменённых файлов: 1 добавлений и 1 удалений

Просмотреть файл

@ -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(