Merge "arm: mm: let CONFIG_VMALLOC_SAVING increase vmalloc by default" (eee5e921) · Commits · e / devices / android_kernel_fairphone_FP3

arch/arm/mm/mmu.c

+0 −14

Original line number	Diff line number	Diff line
		@@ -1158,9 +1158,6 @@ void __init adjust_lowmem_bounds(void)
		u64 vmalloc_limit;
		struct memblock_region *reg;
		phys_addr_t lowmem_limit = 0;
		#ifdef CONFIG_ENABLE_VMALLOC_SAVING
		struct memblock_region *prev_reg = NULL;
		#endif

		/*
		* Let's use our own (unoptimized) equivalent of __pa() that is
		@@ -1171,17 +1168,6 @@ void __init adjust_lowmem_bounds(void)
		*/
		vmalloc_limit = (u64)(uintptr_t)vmalloc_min - PAGE_OFFSET + PHYS_OFFSET;

		#ifdef CONFIG_ENABLE_VMALLOC_SAVING
		for_each_memblock(memory, reg) {
		if (prev_reg == NULL) {
		prev_reg = reg;
		continue;
		}
		vmalloc_limit += reg->base - (prev_reg->base + prev_reg->size);
		prev_reg = reg;
		}
		#endif

		for_each_memblock(memory, reg) {
		phys_addr_t block_start = reg->base;
		phys_addr_t block_end = reg->base + reg->size;