Re: [PATCH V5 1/3] mm/nobootmem: Fix unused variable

[Robin Holt]

On Mon, Jan 20, 2014 at 5:32 AM, Philipp Hachtmann
<phacht@xxxxxxxxxxxxxxxxxx> wrote:
> This fixes an unused variable warning in nobootmem.c
>
> Signed-off-by: Philipp Hachtmann <phacht@xxxxxxxxxxxxxxxxxx>
> ---
>  mm/nobootmem.c | 28 +++++++++++++++++-----------
>  1 file changed, 17 insertions(+), 11 deletions(-)
>
> diff --git a/mm/nobootmem.c b/mm/nobootmem.c
> index e2906a5..0215c77 100644
> --- a/mm/nobootmem.c
> +++ b/mm/nobootmem.c
> @@ -116,23 +116,29 @@ static unsigned long __init __free_memory_core(phys_addr_t start,
>  static unsigned long __init free_low_memory_core_early(void)
>  {
>         unsigned long count = 0;
> -       phys_addr_t start, end, size;
> +       phys_addr_t start, end;
>         u64 i;
>
> +#ifdef CONFIG_ARCH_DISCARD_MEMBLOCK
> +       phys_addr_t size;
> +#endif
> +

Is this needed?  It looks like you declare size again inside the next
#ifdef chunk.

>         for_each_free_mem_range(i, NUMA_NO_NODE, &start, &end, NULL)
>                 count += __free_memory_core(start, end);
>
>  #ifdef CONFIG_ARCH_DISCARD_MEMBLOCK
> -
> -       /* Free memblock.reserved array if it was allocated */
> -       size = get_allocated_memblock_reserved_regions_info(&start);
> -       if (size)
> -               count += __free_memory_core(start, start + size);
> -
> -       /* Free memblock.memory array if it was allocated */
> -       size = get_allocated_memblock_memory_regions_info(&start);
> -       if (size)
> -               count += __free_memory_core(start, start + size);
> +       {
> +               phys_addr_t size;
> +               /* Free memblock.reserved array if it was allocated */
> +               size = get_allocated_memblock_reserved_regions_info(&start);
> +               if (size)
> +                       count += __free_memory_core(start, start + size);
> +
> +               /* Free memblock.memory array if it was allocated */
> +               size = get_allocated_memblock_memory_regions_info(&start);
> +               if (size)
> +                       count += __free_memory_core(start, start + size);
> +       }
>  #endif
>
>         return count;
> --
> 1.8.4.5
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/