Commit a6432ded authored Apr 23, 2013 by Wang YanQing Committed by Rafael J. Wysocki Apr 24, 2013

ACPI: Fix wrong parameter passed to memblock_reserve



Commit 53aac44c (ACPI: Store valid ACPI tables passed via early initrd
in reserved memblock areas) introduced acpi_initrd_override() that
passes a wrong value as the second argument to memblock_reserve().

Namely, the second argument of memblock_reserve() is the size of the
region, not the address of the top of it, so make
acpi_initrd_override() pass the size in there as appropriate.

[rjw: Changelog]
Signed-off-by: Wang YanQing <udknight@gmail.com>
Acked-by: Yinghai Lu <yinghai@kernel.org>
Cc: 3.8+ <stable@vger.kernel.org>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>

parent a50188da

drivers/acpi/osl.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

Admin message