Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4e929d2b authored by Russell King's avatar Russell King
Browse files

ARM: fix memblock breakage 



Will says:
| 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.

Unfortunately, ARM was missed out of this change.  Fix this.

Reported-by: default avatarWill Deacon <will.deacon@arm.com>
Signed-off-by: default avatarRussell King <rmk+kernel@arm.linux.org.uk>
parent 88d927e9

arch/arm/include/asm/memblock.h

+0 −7
Original line number Diff line number Diff line 
#ifndef _ASM_ARM_MEMBLOCK_H

#define _ASM_ARM_MEMBLOCK_H



#ifdef CONFIG_MMU

extern phys_addr_t lowmem_end_addr;

#define MEMBLOCK_REAL_LIMIT	lowmem_end_addr

#else

#define MEMBLOCK_REAL_LIMIT	0

#endif



struct meminfo;

struct machine_desc;

arch/arm/mm/mmu.c

+1 −3
Original line number Diff line number Diff line
@@ -745,13 +745,11 @@ static int __init early_vmalloc(char *arg) 
}

early_param("vmalloc", early_vmalloc);



phys_addr_t lowmem_end_addr;



static void __init sanity_check_meminfo(void)

{

	int i, j, highmem = 0;



	lowmem_end_addr = __pa(vmalloc_min - 1) + 1;

	memblock_set_current_limit(__pa(vmalloc_min - 1) + 1);



	for (i = 0, j = 0; i < meminfo.nr_banks; i++) {

		struct membank *bank = &meminfo.bank[j];