diff options
| -rw-r--r-- | drivers/acpi/apei/apei-base.c | 8 | ||||
| -rw-r--r-- | drivers/acpi/apei/einj.c | 11 |
2 files changed, 10 insertions, 9 deletions
diff --git a/drivers/acpi/apei/apei-base.c b/drivers/acpi/apei/apei-base.c index 61540360d5ce..3492896b96f2 100644 --- a/drivers/acpi/apei/apei-base.c +++ b/drivers/acpi/apei/apei-base.c | |||
| @@ -460,9 +460,9 @@ int apei_resources_request(struct apei_resources *resources, | |||
| 460 | desc); | 460 | desc); |
| 461 | if (!r) { | 461 | if (!r) { |
| 462 | pr_err(APEI_PFX | 462 | pr_err(APEI_PFX |
| 463 | "Can not request iomem region <%016llx-%016llx> for GARs.\n", | 463 | "Can not request [mem %#010llx-%#010llx] for %s registers\n", |
| 464 | (unsigned long long)res->start, | 464 | (unsigned long long)res->start, |
| 465 | (unsigned long long)res->end); | 465 | (unsigned long long)res->end - 1, desc); |
| 466 | res_bak = res; | 466 | res_bak = res; |
| 467 | goto err_unmap_iomem; | 467 | goto err_unmap_iomem; |
| 468 | } | 468 | } |
| @@ -472,9 +472,9 @@ int apei_resources_request(struct apei_resources *resources, | |||
| 472 | r = request_region(res->start, res->end - res->start, desc); | 472 | r = request_region(res->start, res->end - res->start, desc); |
| 473 | if (!r) { | 473 | if (!r) { |
| 474 | pr_err(APEI_PFX | 474 | pr_err(APEI_PFX |
| 475 | "Can not request ioport region <%016llx-%016llx> for GARs.\n", | 475 | "Can not request [io %#06llx-%#06llx] for %s registers\n", |
| 476 | (unsigned long long)res->start, | 476 | (unsigned long long)res->start, |
| 477 | (unsigned long long)res->end); | 477 | (unsigned long long)res->end - 1, desc); |
| 478 | res_bak = res; | 478 | res_bak = res; |
| 479 | goto err_unmap_ioport; | 479 | goto err_unmap_ioport; |
| 480 | } | 480 | } |
diff --git a/drivers/acpi/apei/einj.c b/drivers/acpi/apei/einj.c index 589b96c38704..d25390274d7b 100644 --- a/drivers/acpi/apei/einj.c +++ b/drivers/acpi/apei/einj.c | |||
| @@ -209,9 +209,10 @@ static int __einj_error_trigger(u64 trigger_paddr) | |||
| 209 | "APEI EINJ Trigger Table"); | 209 | "APEI EINJ Trigger Table"); |
| 210 | if (!r) { | 210 | if (!r) { |
| 211 | pr_err(EINJ_PFX | 211 | pr_err(EINJ_PFX |
| 212 | "Can not request iomem region <%016llx-%016llx> for Trigger table.\n", | 212 | "Can not request [mem %#010llx-%#010llx] for Trigger table\n", |
| 213 | (unsigned long long)trigger_paddr, | 213 | (unsigned long long)trigger_paddr, |
| 214 | (unsigned long long)trigger_paddr+sizeof(*trigger_tab)); | 214 | (unsigned long long)trigger_paddr + |
| 215 | sizeof(*trigger_tab) - 1); | ||
| 215 | goto out; | 216 | goto out; |
| 216 | } | 217 | } |
| 217 | trigger_tab = ioremap_cache(trigger_paddr, sizeof(*trigger_tab)); | 218 | trigger_tab = ioremap_cache(trigger_paddr, sizeof(*trigger_tab)); |
| @@ -232,9 +233,9 @@ static int __einj_error_trigger(u64 trigger_paddr) | |||
| 232 | "APEI EINJ Trigger Table"); | 233 | "APEI EINJ Trigger Table"); |
| 233 | if (!r) { | 234 | if (!r) { |
| 234 | pr_err(EINJ_PFX | 235 | pr_err(EINJ_PFX |
| 235 | "Can not request iomem region <%016llx-%016llx> for Trigger Table Entry.\n", | 236 | "Can not request [mem %#010llx-%#010llx] for Trigger Table Entry\n", |
| 236 | (unsigned long long)trigger_paddr+sizeof(*trigger_tab), | 237 | (unsigned long long)trigger_paddr + sizeof(*trigger_tab), |
| 237 | (unsigned long long)trigger_paddr + table_size); | 238 | (unsigned long long)trigger_paddr + table_size - 1); |
| 238 | goto out_rel_header; | 239 | goto out_rel_header; |
| 239 | } | 240 | } |
| 240 | iounmap(trigger_tab); | 241 | iounmap(trigger_tab); |
