projects / GitHub / moto-9609 / android_kernel_motorola_exynos9610.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ce4625f)
MIPS: Octeon: Remove use of CONFIG_64BIT_PHYS_ADDR.
authorRalf Baechle <ralf@linux-mips.org>
Thu, 25 Oct 2012 19:14:59 +0000 (21:14 +0200)
committerRalf Baechle <ralf@linux-mips.org>
Wed, 12 Dec 2012 15:52:06 +0000 (16:52 +0100)
Only supporting 64-bit kernels there is no point in depending on
this symbol.

Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/cavium-octeon/setup.c patch | blob | blame | history

diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c
index efc1ed404b510b2358cc5010c273644ae4dea669..c0c2d14be423dfcffbca62b26ddd3d54aff7606a 100644 (file)
--- a/arch/mips/cavium-octeon/setup.c
+++ b/arch/mips/cavium-octeon/setup.c
@@ -666,7 +666,7 @@ void __init plat_mem_setup(void)
        cvmx_bootmem_lock();
        while ((boot_mem_map.nr_map < BOOT_MEM_MAP_MAX)
                && (total < MAX_MEMORY)) {
-#if defined(CONFIG_64BIT) || defined(CONFIG_64BIT_PHYS_ADDR)
+#ifdef CONFIG_64BIT
                memory = cvmx_bootmem_phy_alloc(mem_alloc_size,
                                                __pa_symbol(&__init_end), -1,
                                                0x100000,