diff options
| author | Tiwei Bie <tiwei.btw@antgroup.com> | 2024-09-16 12:59:49 +0800 |
|---|---|---|
| committer | Johannes Berg <johannes.berg@intel.com> | 2024-10-10 12:02:13 +0200 |
| commit | cd05cbed42b73168b0772b83bc24769fea3871bf (patch) | |
| tree | f4a16ce3bd876e650a983f9abd6e6b7830bbc59c /arch/um/include | |
| parent | a98b7761f697e590ed5d610d87fa12be66f23419 (diff) | |
| download | linux-cd05cbed42b73168b0772b83bc24769fea3871bf.tar.gz linux-cd05cbed42b73168b0772b83bc24769fea3871bf.tar.bz2 linux-cd05cbed42b73168b0772b83bc24769fea3871bf.zip | |
um: Remove highmem leftovers
Highmem was only supported on UML/i386. And the support has been
removed by commit a98a6d864d3b ("um: Remove broken highmem support").
Remove the leftovers and stop UML from trying to setup highmem when
the sum of physmem_size and iomem_size exceeds max_physmem.
Signed-off-by: Tiwei Bie <tiwei.btw@antgroup.com>
Link: https://patch.msgid.link/20240916045950.508910-4-tiwei.btw@antgroup.com
Signed-off-by: Johannes Berg <johannes.berg@intel.com>
Diffstat (limited to 'arch/um/include')
| -rw-r--r-- | arch/um/include/shared/as-layout.h | 1 | ||||
| -rw-r--r-- | arch/um/include/shared/mem_user.h | 5 |
2 files changed, 2 insertions, 4 deletions
diff --git a/arch/um/include/shared/as-layout.h b/arch/um/include/shared/as-layout.h index 06292fca5a4d..61965a06c18a 100644 --- a/arch/um/include/shared/as-layout.h +++ b/arch/um/include/shared/as-layout.h @@ -41,7 +41,6 @@ extern unsigned long uml_physmem; extern unsigned long uml_reserved; extern unsigned long end_vm; extern unsigned long start_vm; -extern unsigned long long highmem; extern unsigned long brk_start; diff --git a/arch/um/include/shared/mem_user.h b/arch/um/include/shared/mem_user.h index 11a723a58545..adfa08062f88 100644 --- a/arch/um/include/shared/mem_user.h +++ b/arch/um/include/shared/mem_user.h @@ -47,10 +47,9 @@ extern int iomem_size; #define ROUND_4M(n) ((((unsigned long) (n)) + (1 << 22)) & ~((1 << 22) - 1)) extern unsigned long find_iomem(char *driver, unsigned long *len_out); -extern void mem_total_pages(unsigned long physmem, unsigned long iomem, - unsigned long highmem); +extern void mem_total_pages(unsigned long physmem, unsigned long iomem); extern void setup_physmem(unsigned long start, unsigned long usable, - unsigned long len, unsigned long long highmem); + unsigned long len); extern void map_memory(unsigned long virt, unsigned long phys, unsigned long len, int r, int w, int x); |