diff options
Diffstat (limited to 'drivers/acpi/osl.c')
-rw-r--r-- | drivers/acpi/osl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c index 586e7e993d3d..e72186340fec 100644 --- a/drivers/acpi/osl.c +++ b/drivers/acpi/osl.c | |||
@@ -641,7 +641,7 @@ void __init acpi_initrd_override(void *data, size_t size) | |||
641 | * Both memblock_reserve and e820_add_region (via arch_reserve_mem_area) | 641 | * Both memblock_reserve and e820_add_region (via arch_reserve_mem_area) |
642 | * works fine. | 642 | * works fine. |
643 | */ | 643 | */ |
644 | memblock_reserve(acpi_tables_addr, acpi_tables_addr + all_tables_size); | 644 | memblock_reserve(acpi_tables_addr, all_tables_size); |
645 | arch_reserve_mem_area(acpi_tables_addr, all_tables_size); | 645 | arch_reserve_mem_area(acpi_tables_addr, all_tables_size); |
646 | 646 | ||
647 | p = early_ioremap(acpi_tables_addr, all_tables_size); | 647 | p = early_ioremap(acpi_tables_addr, all_tables_size); |
@@ -1555,7 +1555,7 @@ int acpi_check_resource_conflict(const struct resource *res) | |||
1555 | else | 1555 | else |
1556 | space_id = ACPI_ADR_SPACE_SYSTEM_MEMORY; | 1556 | space_id = ACPI_ADR_SPACE_SYSTEM_MEMORY; |
1557 | 1557 | ||
1558 | length = res->end - res->start + 1; | 1558 | length = resource_size(res); |
1559 | if (acpi_enforce_resources != ENFORCE_RESOURCES_NO) | 1559 | if (acpi_enforce_resources != ENFORCE_RESOURCES_NO) |
1560 | warn = 1; | 1560 | warn = 1; |
1561 | clash = acpi_check_address_range(space_id, res->start, length, warn); | 1561 | clash = acpi_check_address_range(space_id, res->start, length, warn); |