Skip to content

Commit

Permalink
ARM: fix memblock breakage
Browse files Browse the repository at this point in the history
Will says:
| Commit e63075a 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: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
  • Loading branch information
Russell King committed Oct 27, 2010
1 parent 88d927e commit 4e929d2
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 10 deletions.
7 changes: 0 additions & 7 deletions arch/arm/include/asm/memblock.h
Original file line number Diff line number Diff line change
@@ -1,13 +1,6 @@
#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;

Expand Down
4 changes: 1 addition & 3 deletions arch/arm/mm/mmu.c
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down

0 comments on commit 4e929d2

Please sign in to comment.