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

Merge branch 'for-5.1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu 

Pull percpu fixlet from Dennis Zhou:
 "This stops printing the base address of percpu memory on
  initialization"

* 'for-5.1-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu:
  percpu: stop printing kernel addresses
This commit is contained in:
Linus Torvalds 2019-04-19 15:37:22 -07:00
parent 55e3a6ba5c 00206a69ee
commit 4c3f49ae13
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mm/percpu.c
View File

@ -2567,8 +2567,8 @@ int __init pcpu_embed_first_chunk(size_t reserved_size, size_t dyn_size,
ai->groups[group].base_offset = areas[group] - base; ai->groups[group].base_offset = areas[group] - base;
} }
pr_info("Embedded %zu pages/cpu @%p s%zu r%zu d%zu u%zu\n", pr_info("Embedded %zu pages/cpu s%zu r%zu d%zu u%zu\n",
PFN_DOWN(size_sum), base, ai->static_size, ai->reserved_size, PFN_DOWN(size_sum), ai->static_size, ai->reserved_size,
ai->dyn_size, ai->unit_size); ai->dyn_size, ai->unit_size);
rc = pcpu_setup_first_chunk(ai, base); rc = pcpu_setup_first_chunk(ai, base);
@ -2692,8 +2692,8 @@ int __init pcpu_page_first_chunk(size_t reserved_size,
} }
/* we're ready, commit */ /* we're ready, commit */
pr_info("%d %s pages/cpu @%p s%zu r%zu d%zu\n", pr_info("%d %s pages/cpu s%zu r%zu d%zu\n",
unit_pages, psize_str, vm.addr, ai->static_size, unit_pages, psize_str, ai->static_size,
ai->reserved_size, ai->dyn_size); ai->reserved_size, ai->dyn_size);
rc = pcpu_setup_first_chunk(ai, vm.addr); rc = pcpu_setup_first_chunk(ai, vm.addr);