diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-04-06 10:19:10 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2018-04-06 10:19:10 +1000 |
| commit | e73aaede2d8fc12805828f12fbbc3fb914ec4642 (patch) | |
| tree | 1ae20b553823488f972efaa64c92bdd4e203ffa0 /include/linux | |
| parent | bed31981186fb1c04afcfd2cf6a36e0f29f8961a (diff) | |
| parent | c1b25a17d24925b0961c319cfc3fd7e1dc778914 (diff) | |
Merge remote-tracking branch 'powerpc/next'
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/memblock.h | 3 | ||||
| -rw-r--r-- | include/linux/raid/pq.h | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/include/linux/memblock.h b/include/linux/memblock.h index f92ea7783652..b1c53ff72e48 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -318,6 +318,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, diff --git a/include/linux/raid/pq.h b/include/linux/raid/pq.h index a366cc314479..ea8505204fdf 100644 --- a/include/linux/raid/pq.h +++ b/include/linux/raid/pq.h @@ -106,6 +106,10 @@ extern const struct raid6_calls raid6_avx512x1; extern const struct raid6_calls raid6_avx512x2; extern const struct raid6_calls raid6_avx512x4; extern const struct raid6_calls raid6_s390vx8; +extern const struct raid6_calls raid6_vpermxor1; +extern const struct raid6_calls raid6_vpermxor2; +extern const struct raid6_calls raid6_vpermxor4; +extern const struct raid6_calls raid6_vpermxor8; struct raid6_recov_calls { void (*data2)(int, size_t, int, int, void **); |