diff options
| author |   Tiwei Bie <tiwei.btw@antgroup.com> | 2024-09-16 12:59:50 +0800 |
|---|---|---|
| committer |   Johannes Berg <johannes.berg@intel.com> | 2024-10-10 12:02:13 +0200 |
| commit | 242fef3610e3a38c53781d4d81d8e779021c0af5 (patch) | |
| tree | b2c6b0df0f2807b76d93489a547b1ba84622f480 /arch/um/kernel | |
| parent | um: Remove highmem leftovers (diff) | |
| download | wireguard-linux-242fef3610e3a38c53781d4d81d8e779021c0af5.tar.xz wireguard-linux-242fef3610e3a38c53781d4d81d8e779021c0af5.zip | |
um: Fix the definition for physmem_size
Currently physmem_size is defined as long long but declared locally
as unsigned long long before using it in separate .c files. Make them
match by defining physmem_size as unsigned long long and also move
the declaration to a common header to allow the compiler to check it.
Signed-off-by: Tiwei Bie <tiwei.btw@antgroup.com>
Link: https://patch.msgid.link/20240916045950.508910-5-tiwei.btw@antgroup.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'arch/um/kernel')
| -rw-r--r-- | arch/um/kernel/physmem.c | 2 | ||||
| -rw-r--r-- | arch/um/kernel/um_arch.c | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/arch/um/kernel/physmem.c b/arch/um/kernel/physmem.c index 94aca17993fd..636830fe00f2 100644 --- a/arch/um/kernel/physmem.c +++ b/arch/um/kernel/physmem.c @@ -22,8 +22,6 @@ static int physmem_fd = -1; unsigned long high_physmem; EXPORT_SYMBOL(high_physmem); -extern unsigned long long physmem_size; - void __init mem_total_pages(unsigned long physmem, unsigned long iomem) { unsigned long phys_pages, iomem_pages, total_pages; diff --git a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c index 8f86aa468b50..99cdf4b2d648 100644 --- a/arch/um/kernel/um_arch.c +++ b/arch/um/kernel/um_arch.c @@ -131,7 +131,7 @@ static int have_root __initdata; static int have_console __initdata; /* Set in uml_mem_setup and modified in linux_main */ -long long physmem_size = 64 * 1024 * 1024; +unsigned long long physmem_size = 64 * 1024 * 1024; EXPORT_SYMBOL(physmem_size); static const char *usage_string = |