UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

um: switch to NO_BOOTMEM 

Replace bootmem initialization with memblock_add and memblock_reserve calls
and explicit initialization of {min,max}_low_pfn.

Link: http://lkml.kernel.org/r/1533326330-31677-7-git-send-email-rppt@linux.vnet.ibm.com
Signed-off-by: Mike Rapoport <rppt@linux.vnet.ibm.com>
Acked-by: Richard Weinberger <richard@nod.at>
Cc: Guan Xuetao <gxt@pku.edu.cn>
Cc: Ley Foon Tan <ley.foon.tan@intel.com>
Cc: Richard Kuo <rkuo@codeaurora.org>
Cc: Rob Herring <robh@kernel.org>
Cc: Michal Hocko <mhocko@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Mike Rapoport 2018-10-26 15:05:02 -07:00 committed by Linus Torvalds
parent be6ec5b1ee
commit ddf6398357
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/um/Kconfig
View File

@ -12,6 +12,8 @@ config UML
select HAVE_UID16 select HAVE_UID16
select HAVE_FUTEX_CMPXCHG if FUTEX select HAVE_FUTEX_CMPXCHG if FUTEX
select HAVE_DEBUG_KMEMLEAK select HAVE_DEBUG_KMEMLEAK
select HAVE_MEMBLOCK
select NO_BOOTMEM
select GENERIC_IRQ_SHOW select GENERIC_IRQ_SHOW
select GENERIC_CPU_DEVICES select GENERIC_CPU_DEVICES
select GENERIC_CLOCKEVENTS select GENERIC_CLOCKEVENTS

20
arch/um/kernel/physmem.c
View File

@ -5,6 +5,7 @@
#include <linux/module.h> #include <linux/module.h>
#include <linux/bootmem.h> #include <linux/bootmem.h>
#include <linux/memblock.h>
#include <linux/mm.h> #include <linux/mm.h>
#include <linux/pfn.h> #include <linux/pfn.h>
#include <asm/page.h> #include <asm/page.h>
@ -80,23 +81,18 @@ void __init setup_physmem(unsigned long start, unsigned long reserve_end,
unsigned long len, unsigned long long highmem) unsigned long len, unsigned long long highmem)
{ {
unsigned long reserve = reserve_end - start; unsigned long reserve = reserve_end - start;
unsigned long pfn = PFN_UP(__pa(reserve_end)); long map_size = len - reserve;
unsigned long delta = (len - reserve) >> PAGE_SHIFT;
unsigned long offset, bootmap_size;
long map_size;
int err; int err;
offset = reserve_end - start;
map_size = len - offset;
if(map_size <= 0) { if(map_size <= 0) {
os_warn("Too few physical memory! Needed=%lu, given=%lu\n", os_warn("Too few physical memory! Needed=%lu, given=%lu\n",
offset, len); reserve, len);
exit(1); exit(1);
} }
physmem_fd = create_mem_file(len + highmem); physmem_fd = create_mem_file(len + highmem);
err = os_map_memory((void *) reserve_end, physmem_fd, offset, err = os_map_memory((void *) reserve_end, physmem_fd, reserve,
map_size, 1, 1, 1); map_size, 1, 1, 1);
if (err < 0) { if (err < 0) {
os_warn("setup_physmem - mapping %ld bytes of memory at 0x%p " os_warn("setup_physmem - mapping %ld bytes of memory at 0x%p "
@ -113,9 +109,11 @@ void __init setup_physmem(unsigned long start, unsigned long reserve_end,
os_write_file(physmem_fd, __syscall_stub_start, PAGE_SIZE); os_write_file(physmem_fd, __syscall_stub_start, PAGE_SIZE);
os_fsync_file(physmem_fd); os_fsync_file(physmem_fd);
bootmap_size = init_bootmem(pfn, pfn + delta); memblock_add(__pa(start), len + highmem);
free_bootmem(__pa(reserve_end) + bootmap_size, memblock_reserve(__pa(start), reserve);
len - bootmap_size - reserve);
min_low_pfn = PFN_UP(__pa(reserve_end));
max_low_pfn = min_low_pfn + (map_size >> PAGE_SHIFT);
} }
int phys_mapping(unsigned long phys, unsigned long long *offset_out) int phys_mapping(unsigned long phys, unsigned long long *offset_out)