Commit 06e0e629 authored by Tiwei Bie's avatar Tiwei Bie Committed by Johannes Berg
Browse files

um: Count iomem_size only once in physmem calculation 



When calculating max_physmem, we've already factored in the space
used by iomem. We don't need to subtract it again.

Signed-off-by: default avatarTiwei Bie <tiwei.btw@antgroup.com>
Link: https://patch.msgid.link/20241128081939.2216246-4-tiwei.btw@antgroup.com


Signed-off-by: default avatarJohannes Berg <johannes.berg@intel.com>
parent 5bfc4a3a

arch/um/kernel/um_arch.c

+2 −3
Original line number Diff line number Diff line
@@ -376,9 +376,8 @@ int __init linux_main(int argc, char **argv, char **envp) 
	iomem_size = (iomem_size + PAGE_SIZE - 1) & PAGE_MASK;



	max_physmem = TASK_SIZE - uml_physmem - iomem_size - MIN_VMALLOC;



	if (physmem_size + iomem_size > max_physmem) {

		physmem_size = max_physmem - iomem_size;

	if (physmem_size > max_physmem) {

		physmem_size = max_physmem;

		os_info("Physical memory size shrunk to %llu bytes\n",

			physmem_size);

	}