diff options
| author |   Jason Gunthorpe <jgg@nvidia.com> | 2021-09-28 13:27:40 -0300 |
|---|---|---|
| committer | Jason Gunthorpe <jgg@nvidia.com> | 2021-09-28 13:27:40 -0300 |
| commit | d30ef6d5c013c19e907f2a3a3d6eee04fcd3de0d (patch) | |
| tree | 1a29bbb9fd2bf9a0a5cb3589f18865cf2c1d2985 /init | |
| parent | RDMA/rxe: Remove unused WR_READ_WRITE_OR_SEND_MASK (diff) | |
| parent | IB/mlx5: Enable UAR to have DevX UID (diff) | |
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 'init')
| -rw-r--r-- | init/main.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init/main.c b/init/main.c index 5c9a48df90e1..3f7216934441 100644 --- a/init/main.c +++ b/init/main.c @@ -924,7 +924,7 @@ static void __init print_unknown_bootoptions(void) end += sprintf(end, " %s", *p); pr_notice("Unknown command line parameters:%s\n", unknown_options); - memblock_free(__pa(unknown_options), len); + memblock_free_ptr(unknown_options, len); } asmlinkage __visible void __init __no_sanitize_address start_kernel(void) |