diff options
author | Ralf Baechle <ralf@linux-mips.org> | 2012-10-25 15:21:29 -0400 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2012-12-12 10:52:06 -0500 |
commit | 5456bd26ae0606a98bc937ec71c748f2de5a6a90 (patch) | |
tree | 8d7662bcf30131c138ac5e9b345726c68f3388d5 /arch/mips/cavium-octeon/setup.c | |
parent | 4fe64af7da539bc58c9e571da5ef0eb4589c9a35 (diff) |
MIPS: Octeon: Simplify code by assuming CONFIG_64BIT is always set.
No 32-bit kernels supported on Octeon.
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/cavium-octeon/setup.c')
-rw-r--r-- | arch/mips/cavium-octeon/setup.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c index c0c2d14be423..67aa3b942f06 100644 --- a/arch/mips/cavium-octeon/setup.c +++ b/arch/mips/cavium-octeon/setup.c | |||
@@ -666,16 +666,10 @@ void __init plat_mem_setup(void) | |||
666 | cvmx_bootmem_lock(); | 666 | cvmx_bootmem_lock(); |
667 | while ((boot_mem_map.nr_map < BOOT_MEM_MAP_MAX) | 667 | while ((boot_mem_map.nr_map < BOOT_MEM_MAP_MAX) |
668 | && (total < MAX_MEMORY)) { | 668 | && (total < MAX_MEMORY)) { |
669 | #ifdef CONFIG_64BIT | ||
670 | memory = cvmx_bootmem_phy_alloc(mem_alloc_size, | 669 | memory = cvmx_bootmem_phy_alloc(mem_alloc_size, |
671 | __pa_symbol(&__init_end), -1, | 670 | __pa_symbol(&__init_end), -1, |
672 | 0x100000, | 671 | 0x100000, |
673 | CVMX_BOOTMEM_FLAG_NO_LOCKING); | 672 | CVMX_BOOTMEM_FLAG_NO_LOCKING); |
674 | #else | ||
675 | memory = cvmx_bootmem_phy_alloc(mem_alloc_size, 0, 512 << 20, | ||
676 | 0x100000, | ||
677 | CVMX_BOOTMEM_FLAG_NO_LOCKING); | ||
678 | #endif | ||
679 | if (memory >= 0) { | 673 | if (memory >= 0) { |
680 | u64 size = mem_alloc_size; | 674 | u64 size = mem_alloc_size; |
681 | 675 | ||