diff options
author | Santosh Shilimkar <santosh.shilimkar@ti.com> | 2014-06-05 15:22:52 -0400 |
---|---|---|
committer | Arnd Bergmann <arnd@arndb.de> | 2014-06-05 16:20:54 -0400 |
commit | bbea06f3efbae5776e6c285fea59fd249eec44ff (patch) | |
tree | 95eb19d5c065c4fed8bd99197e4f9c2e14365e26 | |
parent | 06fde1a014611a7902a874330d10e530312ceaef (diff) |
ARM: keystone: Drop use of meminfo since its not available anymore
Laura's series removed the meminfo structure and its no longer available.
Update keystone code to remove the usage of it.
Reported-by: Russell King - ARM Linux <linux@arm.linux.org.uk>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
-rw-r--r-- | arch/arm/mach-keystone/keystone.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-keystone/keystone.c b/arch/arm/mach-keystone/keystone.c index 1f9ae89ee06d..7f352de26099 100644 --- a/arch/arm/mach-keystone/keystone.c +++ b/arch/arm/mach-keystone/keystone.c | |||
@@ -14,6 +14,7 @@ | |||
14 | #include <linux/init.h> | 14 | #include <linux/init.h> |
15 | #include <linux/of_platform.h> | 15 | #include <linux/of_platform.h> |
16 | #include <linux/of_address.h> | 16 | #include <linux/of_address.h> |
17 | #include <linux/memblock.h> | ||
17 | 18 | ||
18 | #include <asm/setup.h> | 19 | #include <asm/setup.h> |
19 | #include <asm/mach/map.h> | 20 | #include <asm/mach/map.h> |
@@ -68,9 +69,8 @@ static void __init keystone_init_meminfo(void) | |||
68 | phys_addr_t offset = PHYS_OFFSET - KEYSTONE_LOW_PHYS_START; | 69 | phys_addr_t offset = PHYS_OFFSET - KEYSTONE_LOW_PHYS_START; |
69 | phys_addr_t mem_start, mem_end; | 70 | phys_addr_t mem_start, mem_end; |
70 | 71 | ||
71 | BUG_ON(meminfo.nr_banks < 1); | 72 | mem_start = memblock_start_of_DRAM(); |
72 | mem_start = meminfo.bank[0].start; | 73 | mem_end = memblock_end_of_DRAM(); |
73 | mem_end = mem_start + meminfo.bank[0].size - 1; | ||
74 | 74 | ||
75 | /* nothing to do if we are running out of the <32-bit space */ | 75 | /* nothing to do if we are running out of the <32-bit space */ |
76 | if (mem_start >= KEYSTONE_LOW_PHYS_START && | 76 | if (mem_start >= KEYSTONE_LOW_PHYS_START && |