From: Ralf Baechle Date: Thu, 25 Oct 2012 19:12:15 +0000 (+0200) Subject: MIPS: Octeon: Remove highmem code. X-Git-Tag: next-20121105~99^2~3 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=256a582d4bb826e0b4b82453fe261c62ed432590;p=karo-tx-linux.git 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 --- 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,