diff options
| author |   Michael Ellerman <mpe@ellerman.id.au> | 2018-03-31 00:11:24 +1100 |
|---|---|---|
| committer | Michael Ellerman <mpe@ellerman.id.au> | 2018-03-31 09:09:36 +1100 |
| commit | f437c51748fa1dd423a878c870ad203843a51c8d (patch) | |
| tree | d1593fe45c0341f88eecd26568bb913ac74c64a1 /arch/powerpc/mm/hash_utils_64.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 | linux-dev-f437c51748fa1dd423a878c870ad203843a51c8d.tar.xz linux-dev-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/hash_utils_64.c')
| -rw-r--r-- | arch/powerpc/mm/hash_utils_64.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/powerpc/mm/hash_utils_64.c b/arch/powerpc/mm/hash_utils_64.c index 4180b89b8922..7587a2ec8874 100644 --- a/arch/powerpc/mm/hash_utils_64.c +++ b/arch/powerpc/mm/hash_utils_64.c @@ -781,7 +781,7 @@ void resize_hpt_for_hotplug(unsigned long new_mem_size) } } -int hash__create_section_mapping(unsigned long start, unsigned long end) +int hash__create_section_mapping(unsigned long start, unsigned long end, int nid) { int rc = htab_bolt_mapping(start, end, __pa(start), pgprot_val(PAGE_KERNEL), mmu_linear_psize, |