summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>2012-10-25 21:12:15 +0200
committerRalf Baechle <ralf@linux-mips.org>2012-12-12 16:52:06 +0100
commitce4625f431d064e65eefacfbe59abe0f642de38e (patch)
treea9c96b42eb1b28e0ebed10dce126bfcaae9b5b1b
parent77a12d0a4a71b4a49c4cd5bac341110c5c527a57 (diff)
MIPS: Octeon: Remove highmem code.
On Cavium hardware only 64-bit kernels are supported so CONFIG_HIGHMEM is never set. Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r--arch/mips/cavium-octeon/setup.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c
index 60ed700a956d..efc1ed404b51 100644
--- a/arch/mips/cavium-octeon/setup.c
+++ b/arch/mips/cavium-octeon/setup.c
@@ -671,10 +671,6 @@ void __init plat_mem_setup(void)
__pa_symbol(&__init_end), -1,
0x100000,
CVMX_BOOTMEM_FLAG_NO_LOCKING);
-#elif defined(CONFIG_HIGHMEM)
- memory = cvmx_bootmem_phy_alloc(mem_alloc_size, 0, 1ull << 31,
- 0x100000,
- CVMX_BOOTMEM_FLAG_NO_LOCKING);
#else
memory = cvmx_bootmem_phy_alloc(mem_alloc_size, 0, 512 << 20,
0x100000,