lkml.org 
[lkml]   [2013]   [May]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[ 071/104] ACPI: Fix wrong parameter passed to memblock_reserve
    Date
    3.8-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Wang YanQing <udknight@gmail.com>

    commit a6432ded299726f123b93d0132fead200551535c upstream.

    Commit 53aac44 (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>
    Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

    ---
    drivers/acpi/osl.c | 2 +-
    1 file changed, 1 insertion(+), 1 deletion(-)

    --- a/drivers/acpi/osl.c
    +++ b/drivers/acpi/osl.c
    @@ -642,7 +642,7 @@ void __init acpi_initrd_override(void *d
    * 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);



    \
     
     \ /
      Last update: 2013-05-07 01:41    [W:2.870 / U:0.000 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site