Merge branch 'x86/crashdump' into x86/urgent (6ce37a58) · Commits · e / devices / android_kernel_xiaomi_markw

arch/x86/kernel/setup.c

+9 −4

Original line number	Diff line number	Diff line
		@@ -788,10 +788,6 @@ void __init setup_arch(char **cmdline_p)

		initmem_init(0, max_pfn);

		#ifdef CONFIG_X86_64
		dma32_reserve_bootmem();
		#endif

		#ifdef CONFIG_ACPI_SLEEP
		/*
		* Reserve low memory region for sleep support.
		@@ -806,6 +802,15 @@ void __init setup_arch(char **cmdline_p)
		#endif
		reserve_crashkernel();

		#ifdef CONFIG_X86_64
		/*
		* dma32_reserve_bootmem() allocates bootmem which may conflict
		* with the crashkernel command line, so do that after
		* reserve_crashkernel()
		*/
		dma32_reserve_bootmem();
		#endif

		reserve_ibft_region();

		#ifdef CONFIG_KVM_CLOCK