On Mon, Jan 13, 2014 at 3:37 AM, Philipp Hachtmann
<pha...@linux.vnet.ibm.com> wrote:
> get_allocated_memblock_reserved_regions_info() should work if it is
> compiled in. Extended the ifdef around
> get_allocated_memblock_memory_regions_info() to include
> get_allocated_memblock_reserved_regions_info() as well.
> Similar changes in nobootmem.c/free_low_memory_core_early() where
> the two functions are called.
>
> Signed-off-by: Philipp Hachtmann <pha...@linux.vnet.ibm.com>
Acked-by: Yinghai Lu <ying...@kernel.org>
> ---
> mm/memblock.c | 17 ++---------------
> mm/nobootmem.c | 4 ++--
> 2 files changed, 4 insertions(+), 17 deletions(-)
>
> diff --git a/mm/memblock.c b/mm/memblock.c
> index 64ed243..9c0aeef 100644
> --- a/mm/memblock.c
> +++ b/mm/memblock.c
> @@ -266,33 +266,20 @@ static void __init_memblock
> memblock_remove_region(struct memblock_type *type, u
> }
> }
>
> +#ifdef CONFIG_ARCH_DISCARD_MEMBLOCK
> +
> phys_addr_t __init_memblock get_allocated_memblock_reserved_regions_info(
> phys_addr_t *addr)
> {
> if (memblock.reserved.regions == memblock_reserved_init_regions)
> return 0;
>
> - /*
> - * Don't allow nobootmem allocator to free reserved memory regions
> - * array if
> - * - CONFIG_DEBUG_FS is enabled;
> - * - CONFIG_ARCH_DISCARD_MEMBLOCK is not enabled;
> - * - reserved memory regions array have been resized during boot.
> - * Otherwise debug_fs entry "sys/kernel/debug/memblock/reserved"
> - * will show garbage instead of state of memory reservations.
> - */
> - if (IS_ENABLED(CONFIG_DEBUG_FS) &&
> - !IS_ENABLED(CONFIG_ARCH_DISCARD_MEMBLOCK))
> - return 0;
> -
> *addr = __pa(memblock.reserved.regions);
>
> return PAGE_ALIGN(sizeof(struct memblock_region) *
> memblock.reserved.max);
> }
>
> -#ifdef CONFIG_ARCH_DISCARD_MEMBLOCK
> -
> phys_addr_t __init_memblock get_allocated_memblock_memory_regions_info(
> phys_addr_t *addr)
> {
> diff --git a/mm/nobootmem.c b/mm/nobootmem.c
> index 17c8902..e2906a5 100644
> --- a/mm/nobootmem.c
> +++ b/mm/nobootmem.c
> @@ -122,13 +122,13 @@ static unsigned long __init
> free_low_memory_core_early(void)
> 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);
>
> -#ifdef CONFIG_ARCH_DISCARD_MEMBLOCK
> -
> /* Free memblock.memory array if it was allocated */
> size = get_allocated_memblock_memory_regions_info(&start);
> if (size)
> --
> 1.8.4.5
>
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
