Merge tag 'selinux-pr-20190917' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux.git] / arch / mips / cavium-octeon / setup.c

diff --git a/arch/mips/cavium-octeon/setup.c b/arch/mips/cavium-octeon/setup.c
index 8bf43c5a7bc71588d648c58b1d68bb3b82677832..95034bf5ca8353e43e7807d70010248b1dae46e7 100644 (file)
--- a/arch/mips/cavium-octeon/setup.c
+++ b/arch/mips/cavium-octeon/setup.c
@@ -1007,8 +1007,7 @@ void __init plat_mem_setup(void)
         * regions next to each other.
         */
        cvmx_bootmem_lock();
-       while ((boot_mem_map.nr_map < BOOT_MEM_MAP_MAX)
-               && (total < max_memory)) {
+       while (total < max_memory) {
                memory = cvmx_bootmem_phy_alloc(mem_alloc_size,
                                                __pa_symbol(&_end), -1,
                                                0x100000,