From 138ad5f8f3fbc46a07134ee16129da9016f21de4 Mon Sep 17 00:00:00 2001 From: Wang YanQing Date: Tue, 23 Apr 2013 01:19:19 +0200 Subject: [PATCH] --- yaml --- r: 367614 b: refs/heads/master c: a6432ded299726f123b93d0132fead200551535c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/acpi/osl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 2c34723b5466..a3ac983629e5 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a50188dae3089dcd15a6ae793528c157680891f1 +refs/heads/master: a6432ded299726f123b93d0132fead200551535c diff --git a/trunk/drivers/acpi/osl.c b/trunk/drivers/acpi/osl.c index 4d31748faca3..e72186340fec 100644 --- a/trunk/drivers/acpi/osl.c +++ b/trunk/drivers/acpi/osl.c @@ -641,7 +641,7 @@ void __init acpi_initrd_override(void *data, size_t size) * Both memblock_reserve and e820_add_region (via arch_reserve_mem_area) * works fine. */ - memblock_reserve(acpi_tables_addr, acpi_tables_addr + all_tables_size); + memblock_reserve(acpi_tables_addr, all_tables_size); arch_reserve_mem_area(acpi_tables_addr, all_tables_size); p = early_ioremap(acpi_tables_addr, all_tables_size);