Merge "mm/ARM: prepare for removing num_physpages and simplify mem_init()" (84f890d5) · Commits · e / devices / android_kernel_sony_msm8994

arch/arm/mm/init.c

+2 −52

Original line number	Diff line number	Diff line
		@@ -694,9 +694,6 @@ static void print_vmalloc_lowmem_info(void)
		*/
		void __init mem_init(void)
		{
		unsigned long reserved_pages, free_pages;
		struct memblock_region *reg;
		int i;
		#ifdef CONFIG_HAVE_TCM
		/* These pointers are filled in on TCM detection */
		extern u32 dtcm_end;
		@@ -716,54 +713,7 @@ void __init mem_init(void)

		free_highpages();

		reserved_pages = free_pages = 0;

		for_each_bank(i, &meminfo) {
		struct membank *bank = &meminfo.bank[i];
		unsigned int pfn1, pfn2;
		struct page page, end;

		pfn1 = bank_pfn_start(bank);
		pfn2 = bank_pfn_end(bank);

		page = pfn_to_page(pfn1);
		end = pfn_to_page(pfn2 - 1) + 1;

		do {
		if (PageReserved(page))
		reserved_pages++;
		else if (!page_count(page))
		free_pages++;
		page++;
		#ifdef CONFIG_SPARSEMEM
		pfn1++;
		if (!(pfn1 % PAGES_PER_SECTION))
		page = pfn_to_page(pfn1);
		} while (pfn1 < pfn2);
		#else
		} while (page < end);
		#endif
		}

		/*
		* Since our memory may not be contiguous, calculate the
		* real number of pages we have in this system
		*/
		printk(KERN_INFO "Memory:");
		num_physpages = 0;
		for_each_memblock(memory, reg) {
		unsigned long pages = memblock_region_memory_end_pfn(reg) -
		memblock_region_memory_base_pfn(reg);
		num_physpages += pages;
		printk(" %ldMB", pages >> (20 - PAGE_SHIFT));
		}
		printk(" = %luMB total\n", num_physpages >> (20 - PAGE_SHIFT));

		printk(KERN_NOTICE "Memory: %luk/%luk available, %luk reserved, %luK highmem\n",
		nr_free_pages() << (PAGE_SHIFT-10),
		free_pages << (PAGE_SHIFT-10),
		reserved_pages << (PAGE_SHIFT-10),
		totalhigh_pages << (PAGE_SHIFT-10));
		mem_init_print_info(NULL);

		printk(KERN_NOTICE "Virtual kernel memory layout:\n"
		" vector : 0x%08lx - 0x%08lx (%4ld kB)\n"
		@@ -826,7 +776,7 @@ void __init mem_init(void)
		BUG_ON(PKMAP_BASE + LAST_PKMAP * PAGE_SIZE > PAGE_OFFSET);
		#endif

		if (PAGE_SIZE >= 16384 && num_physpages <= 128) {
		if (PAGE_SIZE >= 16384 && get_num_physpages() <= 128) {
		extern int sysctl_overcommit_memory;
		/*
		* On a machine this small we won't get