diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2012-01-11 09:41:47 -0500 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2012-01-11 09:41:47 -0500 |
commit | 39b741431af7f6f46b2e0e7f7f13ea2351fb4a5f (patch) | |
tree | 89355f4ae7bbb874537bb65f71ba0d19b3d468e1 /arch/mips/cavium-octeon | |
parent | 5b0ec2efb7d373faa7b1a7632c459b93895d45cd (diff) | |
parent | d7a887a73dec6c387b02a966a71aac767bbd9ce6 (diff) |
Merge branch 'next/generic' into mips-for-linux-next
Diffstat (limited to 'arch/mips/cavium-octeon')
-rw-r--r-- | arch/mips/cavium-octeon/setup.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c index 853bac4f25b2..260b27367347 100644 --- a/arch/mips/cavium-octeon/setup.c +++ b/arch/mips/cavium-octeon/setup.c | |||
@@ -642,14 +642,6 @@ void __init plat_mem_setup(void) | |||
642 | 642 | ||
643 | total = 0; | 643 | total = 0; |
644 | 644 | ||
645 | /* First add the init memory we will be returning. */ | ||
646 | memory = __pa_symbol(&__init_begin) & PAGE_MASK; | ||
647 | mem_alloc_size = (__pa_symbol(&__init_end) & PAGE_MASK) - memory; | ||
648 | if (mem_alloc_size > 0) { | ||
649 | add_memory_region(memory, mem_alloc_size, BOOT_MEM_RAM); | ||
650 | total += mem_alloc_size; | ||
651 | } | ||
652 | |||
653 | /* | 645 | /* |
654 | * The Mips memory init uses the first memory location for | 646 | * The Mips memory init uses the first memory location for |
655 | * some memory vectors. When SPARSEMEM is in use, it doesn't | 647 | * some memory vectors. When SPARSEMEM is in use, it doesn't |