diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-12 10:54:53 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-12-12 10:54:53 -0500 |
| commit | 139353ffbe42ac7abda42f3259c1c374cbf4b779 (patch) | |
| tree | 64208b3f2432e1e2bff5c09a860cb6065b9a6427 /drivers/acpi/apei | |
| parent | 251a8cfeda7c8a0ff26c62659a2358d3b4ff32df (diff) | |
| parent | 112f1fc08d0b3f81c594af617d88c0db6ce0873c (diff) | |
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
Diffstat (limited to 'drivers/acpi/apei')
| -rw-r--r-- | drivers/acpi/apei/einj.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/acpi/apei/einj.c b/drivers/acpi/apei/einj.c index 8e1793649ec0..8d457b55c55a 100644 --- a/drivers/acpi/apei/einj.c +++ b/drivers/acpi/apei/einj.c | |||
| @@ -367,7 +367,7 @@ static int __einj_error_trigger(u64 trigger_paddr, u32 type, | |||
| 367 | * This will cause resource conflict with regular memory. So | 367 | * This will cause resource conflict with regular memory. So |
| 368 | * remove it from trigger table resources. | 368 | * remove it from trigger table resources. |
| 369 | */ | 369 | */ |
| 370 | if (param_extension && (type & 0x0038) && param2) { | 370 | if ((param_extension || acpi5) && (type & 0x0038) && param2) { |
| 371 | struct apei_resources addr_resources; | 371 | struct apei_resources addr_resources; |
| 372 | apei_resources_init(&addr_resources); | 372 | apei_resources_init(&addr_resources); |
| 373 | trigger_param_region = einj_get_trigger_parameter_region( | 373 | trigger_param_region = einj_get_trigger_parameter_region( |