[PATCH]drivers:acpi: Fix wrong parameter passed to memblock_reserve

[PATCH]drivers:acpi: Fix wrong parameter passed to memblock_reserve

[Wang YanQing]

The parameter of memblock_reserve is start address,
and size, not address range.

Signed-off-by: Wang YanQing <udknight@gmail.com>
---
 drivers/acpi/osl.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
index 586e7e9..bcb7a3b 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)
 	 * 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);
-- 
1.7.12.4.dirty

Re: [PATCH]drivers:acpi: Fix wrong parameter passed to memblock_reserve

[Yinghai Lu]

On Mon, Apr 15, 2013 at 6:44 PM, Wang YanQing <udknight@gmail.com> wrote:
>
> The parameter of memblock_reserve is start address,
> and size, not address range.
>
> Signed-off-by: Wang YanQing <udknight@gmail.com>
> ---
>  drivers/acpi/osl.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
> index 586e7e9..bcb7a3b 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)
>          * 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);

Acked-by: Yinghai Lu <yinghai@kernel.org>

And it should go to stable for v3.8

Re: [PATCH]drivers:acpi: Fix wrong parameter passed to memblock_reserve

[Wang YanQing]

On Mon, Apr 15, 2013 at 07:47:38PM -0700, Yinghai Lu wrote:
> On Mon, Apr 15, 2013 at 6:44 PM, Wang YanQing <udknight@gmail.com> wrote:
> >
> > The parameter of memblock_reserve is start address,
> > and size, not address range.
> >
> > Signed-off-by: Wang YanQing <udknight@gmail.com>
> > ---
> >  drivers/acpi/osl.c | 2 +-
> >  1 file changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
> > index 586e7e9..bcb7a3b 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)
> >          * 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);
> 
> Acked-by: Yinghai Lu <yinghai@kernel.org>
> 
> And it should go to stable for v3.8

Hi all, I think this fix should be merged before 3.9 is out,
it make no much sense to backport it for 3.9 later, but we don't have 
much time before 3.9 is out, so...

Thanks.

Re: [PATCH]drivers:acpi: Fix wrong parameter passed to memblock_reserve

[Rafael J. Wysocki]

On Friday, April 19, 2013 12:40:46 PM Wang YanQing wrote:
> On Mon, Apr 15, 2013 at 07:47:38PM -0700, Yinghai Lu wrote:
> > On Mon, Apr 15, 2013 at 6:44 PM, Wang YanQing <udknight@gmail.com> wrote:
> > >
> > > The parameter of memblock_reserve is start address,
> > > and size, not address range.
> > >
> > > Signed-off-by: Wang YanQing <udknight@gmail.com>
> > > ---
> > >  drivers/acpi/osl.c | 2 +-
> > >  1 file changed, 1 insertion(+), 1 deletion(-)
> > >
> > > diff --git a/drivers/acpi/osl.c b/drivers/acpi/osl.c
> > > index 586e7e9..bcb7a3b 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)
> > >          * 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);
> > 
> > Acked-by: Yinghai Lu <yinghai@kernel.org>
> > 
> > And it should go to stable for v3.8
> 
> Hi all, I think this fix should be merged before 3.9 is out,
> it make no much sense to backport it for 3.9 later, but we don't have 
> much time before 3.9 is out, so...
> 
> Thanks.

Applied, but please send ACPI patches (and especially urgent fixes) to
linux-acpi@vger.kernel.org in the future.

Thanks,
Rafael


-- 
I speak only for myself.
Rafael J. Wysocki, Intel Open Source Technology Center.