aboutsummaryrefslogtreecommitdiff
path: root/arch/arm/include/asm/memblock.h
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-10-27 18:09:59 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-10-27 21:41:39 +0100
commit4e929d2bcf13eeaa9636448c55690b383a910391 (patch)
treec50dbc31dc4d2c6fee40c17fec06ef90c84a5ee6 /arch/arm/include/asm/memblock.h
parent88d927e94805ebeec11ec7687df7789b954e334e (diff)
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: Will Deacon <will.deacon@arm.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/include/asm/memblock.h')
-rw-r--r--arch/arm/include/asm/memblock.h7
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/arm/include/asm/memblock.h b/arch/arm/include/asm/memblock.h
index fdbc43b2e6c..b8da2e415e4 100644
--- a/arch/arm/include/asm/memblock.h
+++ b/arch/arm/include/asm/memblock.h
@@ -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;