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 /include | |
| parent | 872a100a49c3785b4577e002580ca5689d1be7a1 (diff) | |
| parent | 29ab6c4708a587bc27ea0c765ac36aef9c1a77c9 (diff) | |
| download | linux-f437c51748fa1dd423a878c870ad203843a51c8d.tar.gz linux-f437c51748fa1dd423a878c870ad203843a51c8d.tar.bz2 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 'include')
| -rw-r--r-- | include/linux/memblock.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/memblock.h b/include/linux/memblock.h index 8be5077efb5f..4e1e3d0b002a 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -319,6 +319,9 @@ static inline bool memblock_bottom_up(void) phys_addr_t __init memblock_alloc_range(phys_addr_t size, phys_addr_t align, phys_addr_t start, phys_addr_t end, ulong flags); +phys_addr_t memblock_alloc_base_nid(phys_addr_t size, + phys_addr_t align, phys_addr_t max_addr, + int nid, ulong flags); phys_addr_t memblock_alloc_base(phys_addr_t size, phys_addr_t align, phys_addr_t max_addr); phys_addr_t __memblock_alloc_base(phys_addr_t size, phys_addr_t align, |