diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2012-10-25 21:21:29 +0200 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2012-12-12 16:52:06 +0100 |
| commit | 5456bd26ae0606a98bc937ec71c748f2de5a6a90 (patch) | |
| tree | 8d7662bcf30131c138ac5e9b345726c68f3388d5 /arch/mips/cavium-octeon/setup.c | |
| parent | MIPS: Octeon: Remove use of CONFIG_64BIT_PHYS_ADDR. (diff) | |
| download | linux-5456bd26ae0606a98bc937ec71c748f2de5a6a90.tar.xz linux-5456bd26ae0606a98bc937ec71c748f2de5a6a90.zip | |
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) cvmx_bootmem_lock(); while ((boot_mem_map.nr_map < BOOT_MEM_MAP_MAX) && (total < MAX_MEMORY)) { -#ifdef CONFIG_64BIT memory = cvmx_bootmem_phy_alloc(mem_alloc_size, __pa_symbol(&__init_end), -1, 0x100000, CVMX_BOOTMEM_FLAG_NO_LOCKING); -#else - memory = cvmx_bootmem_phy_alloc(mem_alloc_size, 0, 512 << 20, - 0x100000, - CVMX_BOOTMEM_FLAG_NO_LOCKING); -#endif if (memory >= 0) { u64 size = mem_alloc_size; |