diff options
| author | Michael Ellerman | 2018-03-30 15:11:24 +0200 |
|---|---|---|
| committer | Michael Ellerman | 2018-03-31 00:09:36 +0200 |
| commit | f437c51748fa1dd423a878c870ad203843a51c8d (patch) | |
| tree | d1593fe45c0341f88eecd26568bb913ac74c64a1 /arch/powerpc/mm/pgtable-book3s64.c | |
| parent | powerpc/mm/hash: Don't memset pgd table if not needed (diff) | |
| parent | powerpc/mm: Pass node id into create_section_mapping (diff) | |
| download | kernel-qcow2-linux-f437c51748fa1dd423a878c870ad203843a51c8d.tar.gz kernel-qcow2-linux-f437c51748fa1dd423a878c870ad203843a51c8d.tar.xz kernel-qcow2-linux-f437c51748fa1dd423a878c870ad203843a51c8d.zip | |
Merge branch 'topic/paca' into next
Bring in yet another series that touches KVM code, and might need to
be merged into the kvm-ppc branch to resolve conflicts.
This required some changes in pnv_power9_force_smt4_catch/release()
due to the paca array becomming an array of pointers.
Diffstat (limited to 'arch/powerpc/mm/pgtable-book3s64.c')
| -rw-r--r-- | arch/powerpc/mm/pgtable-book3s64.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/powerpc/mm/pgtable-book3s64.c b/arch/powerpc/mm/pgtable-book3s64.c index bd6ca74acf9e..518518fb7c45 100644 --- a/arch/powerpc/mm/pgtable-book3s64.c +++ b/arch/powerpc/mm/pgtable-book3s64.c @@ -155,12 +155,12 @@ void mmu_cleanup_all(void) } #ifdef CONFIG_MEMORY_HOTPLUG -int __meminit create_section_mapping(unsigned long start, unsigned long end) +int __meminit create_section_mapping(unsigned long start, unsigned long end, int nid) { if (radix_enabled()) - return radix__create_section_mapping(start, end); + return radix__create_section_mapping(start, end, nid); - return hash__create_section_mapping(start, end); + return hash__create_section_mapping(start, end, nid); } int __meminit remove_section_mapping(unsigned long start, unsigned long end) |