Merge branch 'v3.18/topic/fixes' into linux-linaro-lsk-v3.18 (8e20db3c) · Commits · e / devices / android_kernel_xiaomi_markw

arch/arm64/kernel/setup.c

+0 −19

Original line number	Diff line number	Diff line
		@@ -317,25 +317,6 @@ static void __init setup_machine_fdt(phys_addr_t dt_phys)
		}
		}

		/*
		* Limit the memory size that was specified via FDT.
		*/
		static int __init early_mem(char *p)
		{
		phys_addr_t limit;

		if (!p)
		return 1;

		limit = memparse(p, &p) & PAGE_MASK;
		pr_notice("Memory limited to %lldMB\n", limit >> 20);

		memblock_enforce_memory_limit(limit);

		return 0;
		}
		early_param("mem", early_mem);

		static void __init request_standard_resources(void)
		{
		struct memblock_region *region;

+19 −0

Original line number	Diff line number	Diff line
		@@ -136,10 +136,29 @@ static void arm64_memory_present(void)
		}
		#endif

		static phys_addr_t memory_limit = (phys_addr_t)ULLONG_MAX;

		/*
		* Limit the memory size that was specified via FDT.
		*/
		static int __init early_mem(char *p)
		{
		if (!p)
		return 1;

		memory_limit = memparse(p, &p) & PAGE_MASK;
		pr_notice("Memory limited to %lldMB\n", memory_limit >> 20);

		return 0;
		}
		early_param("mem", early_mem);

		void __init arm64_memblock_init(void)
		{
		phys_addr_t dma_phys_limit = 0;

		memblock_enforce_memory_limit(memory_limit);

		/*
		* Register the kernel text, kernel data, initrd, and initial
		* pagetables with memblock.