diff options
| author | Jason Gunthorpe <jgg@nvidia.com> | 2021-09-28 19:27:40 +0300 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@nvidia.com> | 2021-09-28 19:27:40 +0300 |
| commit | d30ef6d5c013c19e907f2a3a3d6eee04fcd3de0d (patch) | |
| tree | 1a29bbb9fd2bf9a0a5cb3589f18865cf2c1d2985 /include/linux/memblock.h | |
| parent | 27da60547de16a877fb192b90e4841e52fbe8fcd (diff) | |
| parent | d2c8a1554c10d5e0443b1f97f480d7dacd55cf55 (diff) | |
| download | linux-d30ef6d5c013c19e907f2a3a3d6eee04fcd3de0d.tar.xz | |
Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux
Leon Romanovsky says:
====================
This is short series for mlx5 from Meir that adds a DevX UID to the UAR.
====================
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
* mellanox/mlx5-next:
IB/mlx5: Enable UAR to have DevX UID
net/mlx5: Add uid field to UAR allocation structures
Diffstat (limited to 'include/linux/memblock.h')
| -rw-r--r-- | include/linux/memblock.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/memblock.h b/include/linux/memblock.h index b066024c62e3..34de69b3b8ba 100644 --- a/include/linux/memblock.h +++ b/include/linux/memblock.h @@ -118,6 +118,7 @@ int memblock_mark_nomap(phys_addr_t base, phys_addr_t size); int memblock_clear_nomap(phys_addr_t base, phys_addr_t size); void memblock_free_all(void); +void memblock_free_ptr(void *ptr, size_t size); void reset_node_managed_pages(pg_data_t *pgdat); void reset_all_zones_managed_pages(void); |