[PATCH] ARM: memblock: set allocation limit for MEMBLOCK_ALLOC_ANYWHERE

[Russell King - ARM Linux]

On Mon, Oct 25, 2010 at 11:48:00AM +0100, Catalin Marinas wrote:
> From: Will Deacon <will.deacon at arm.com>
> 
> Commit e63075a3 removed the explicit MEMBLOCK_REAL_LIMIT #define
> and introduced the requirement that arch code calls
> memblock_set_current_limit to ensure that the __va macro can
> be used on physical addresses returned from memblock_alloc.
> 
> This patch ensures that memblock allocates from lowmem on ARM
> by setting the allocation limit to lowmem_end_addr.
> 
> Signed-off-by: Will Deacon <will.deacon at arm.com>
> Signed-off-by: Catalin Marinas <catalin.marinas at arm.com>
> ---
>  arch/arm/include/asm/memblock.h |    3 ---
>  arch/arm/mm/mmu.c               |    1 +
>  2 files changed, 1 insertions(+), 3 deletions(-)
> 
> diff --git a/arch/arm/include/asm/memblock.h b/arch/arm/include/asm/memblock.h
> index fdbc43b..655b4c4 100644
> --- a/arch/arm/include/asm/memblock.h
> +++ b/arch/arm/include/asm/memblock.h
> @@ -3,9 +3,6 @@
>  
>  #ifdef CONFIG_MMU
>  extern phys_addr_t lowmem_end_addr;

This doesn't need to be exported anymore.

> -#define MEMBLOCK_REAL_LIMIT	lowmem_end_addr
> -#else
> -#define MEMBLOCK_REAL_LIMIT	0
>  #endif
>  
>  struct meminfo;
> diff --git a/arch/arm/mm/mmu.c b/arch/arm/mm/mmu.c
> index 72cc529..fd7bb1e 100644
> --- a/arch/arm/mm/mmu.c
> +++ b/arch/arm/mm/mmu.c
> @@ -753,6 +753,7 @@ static void __init sanity_check_meminfo(void)
>  	int i, j, highmem = 0;
>  
>  	lowmem_end_addr = __pa(vmalloc_min - 1) + 1;
> +	memblock_set_current_limit(lowmem_end_addr);

So this might as well become:
	memblock_set_current_limit(__pa(vmalloc_min - 1) + 1);